diff --git a/.github/lexicon.txt b/.github/lexicon.txt
index 47d2349bfff..bc8a193160c 100644
--- a/.github/lexicon.txt
+++ b/.github/lexicon.txt
@@ -2095,9 +2095,7 @@ taskscheduler
 taskselect
 taskstamp
 taskstampcount
-taskstatus
 taskutils
-taskyield
 tblpag
 tblptrh
 tblptrl
diff --git a/portable/GCC/ARM_CM3/port.c b/portable/GCC/ARM_CM3/port.c
index a5cea1e1e1b..c60336738b3 100644
--- a/portable/GCC/ARM_CM3/port.c
+++ b/portable/GCC/ARM_CM3/port.c
@@ -737,7 +737,7 @@ __attribute__( ( weak ) ) void vPortSetupTimerInterrupt( void )
              * The following links provide detailed information:
              * https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html
              * https://www.FreeRTOS.org/FAQHelp.html */
-            configASSERT( ucCurrentPriority >= ucMaxSysCallPriority );
+            configASSERT( ucCurrentPriority >= ulMaxSysCallPriority );
         }
 
         /* Priority grouping:  The interrupt controller (NVIC) allows the bits
diff --git a/portable/GCC/ARM_CM3_MPU/port.c b/portable/GCC/ARM_CM3_MPU/port.c
index 5f7d2c81113..d1502d5f239 100644
--- a/portable/GCC/ARM_CM3_MPU/port.c
+++ b/portable/GCC/ARM_CM3_MPU/port.c
@@ -903,7 +903,7 @@ void vPortStoreTaskMPUSettings( xMPU_SETTINGS * xMPUSettings,
              * The following links provide detailed information:
              * https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html
              * https://www.FreeRTOS.org/FAQHelp.html */
-            configASSERT( ucCurrentPriority >= ucMaxSysCallPriority );
+            configASSERT( ucCurrentPriority >= ulMaxSysCallPriority );
         }
 
         /* Priority grouping:  The interrupt controller (NVIC) allows the bits
diff --git a/tasks.c b/tasks.c
index 0e7a56c6058..5e11eb0d988 100644
--- a/tasks.c
+++ b/tasks.c
@@ -5113,10 +5113,10 @@ TickType_t uxTaskResetEventItemValue( void )
                                         BaseType_t * pxHigherPriorityTaskWoken )
     {
         TCB_t * pxTCB;
-        uint8_t ucOriginalNotifyState;
+      uint8_t ucOriginalNotifyState;
         portBASE_TYPE xSavedInterruptStatus;
 
-        configASSERT( xTaskToNotify );
+      configASSERT( xTaskToNotify );
         configASSERT( uxIndexToNotify < configTASK_NOTIFICATION_ARRAY_ENTRIES );
 
         /* RTOS ports that support interrupt nesting have the concept of a
@@ -5137,11 +5137,11 @@ TickType_t uxTaskResetEventItemValue( void )
          * https://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
         portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
 
-        pxTCB = xTaskToNotify;
+      pxTCB = xTaskToNotify;
 
         xSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
         {
-            ucOriginalNotifyState = pxTCB->ucNotifyState[ uxIndexToNotify ];
+          ucOriginalNotifyState = pxTCB->ucNotifyState[ uxIndexToNotify ];
             pxTCB->ucNotifyState[ uxIndexToNotify ] = taskNOTIFICATION_RECEIVED;
 
             /* 'Giving' is equivalent to incrementing a count in a counting