diff --git a/croutine.c b/croutine.c
index 4a821937d35..68dcab05523 100644
--- a/croutine.c
+++ b/croutine.c
@@ -393,10 +393,10 @@
 
         /* Other file private variables. */
         pxCurrentCoRoutine = NULL;
-        uxTopCoRoutineReadyPriority = 0;
-        xCoRoutineTickCount = 0;
-        xLastTickCount = 0;
-        xPassedTicks = 0;
+        uxTopCoRoutineReadyPriority = ( UBaseType_t ) 0U;
+        xCoRoutineTickCount = ( TickType_t ) 0U;
+        xLastTickCount = ( TickType_t ) 0U;
+        xPassedTicks = ( TickType_t ) 0U;
     }
 /*-----------------------------------------------------------*/
 
diff --git a/portable/MemMang/heap_1.c b/portable/MemMang/heap_1.c
index 5a49801eaf5..ce141adbe52 100644
--- a/portable/MemMang/heap_1.c
+++ b/portable/MemMang/heap_1.c
@@ -160,6 +160,6 @@ size_t xPortGetFreeHeapSize( void )
  */
 void vPortHeapResetState( void )
 {
-    xNextFreeByte = ( size_t ) 0;
+    xNextFreeByte = ( size_t ) 0U;
 }
 /*-----------------------------------------------------------*/
diff --git a/portable/MemMang/heap_4.c b/portable/MemMang/heap_4.c
index 77bd9138a7b..617a946ce86 100644
--- a/portable/MemMang/heap_4.c
+++ b/portable/MemMang/heap_4.c
@@ -618,9 +618,9 @@ void vPortHeapResetState( void )
 {
     pxEnd = NULL;
 
-    xFreeBytesRemaining = 0U;
-    xMinimumEverFreeBytesRemaining = 0U;
-    xNumberOfSuccessfulAllocations = 0;
-    xNumberOfSuccessfulFrees = 0;
+    xFreeBytesRemaining = ( size_t) 0U;
+    xMinimumEverFreeBytesRemaining = ( size_t )0U;
+    xNumberOfSuccessfulAllocations = ( size_t ) 0U;
+    xNumberOfSuccessfulFrees = ( size_t ) 0U;
 }
 /*-----------------------------------------------------------*/
diff --git a/portable/MemMang/heap_5.c b/portable/MemMang/heap_5.c
index 9df68726e27..137394e0cee 100644
--- a/portable/MemMang/heap_5.c
+++ b/portable/MemMang/heap_5.c
@@ -717,10 +717,10 @@ void vPortHeapResetState( void )
 {
     pxEnd = NULL;
 
-    xFreeBytesRemaining = 0U;
-    xMinimumEverFreeBytesRemaining = 0U;
-    xNumberOfSuccessfulAllocations = 0;
-    xNumberOfSuccessfulFrees = 0;
+    xFreeBytesRemaining = ( size_t ) 0U;
+    xMinimumEverFreeBytesRemaining = ( size_t ) 0U;
+    xNumberOfSuccessfulAllocations = ( size_t ) 0U;
+    xNumberOfSuccessfulFrees = ( size_t ) 0U;
 
     #if ( configENABLE_HEAP_PROTECTOR == 1 )
         pucHeapHighAddress = NULL;