diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
index 78334daa35..0b17708676 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
@@ -128,7 +128,7 @@ void vTraceStoreLowPower(uint32_t flag)
 			lp = (LPEvent*)xTraceNextFreeEventBufferSlot();
 			if (lp != NULL)
 			{
-				lp->type = LOW_POWER_BEGIN + flag; /* BEGIN or END depending on flag */
+				lp->type = LOW_POWER_BEGIN + ( uint8_t ) flag; /* BEGIN or END depending on flag */
 				lp->dts = dts;
 
 				prvTraceUpdateCounters();
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c
index 6cf8c1f9c7..74dc8079e4 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c
@@ -208,6 +208,7 @@ char* xTraceGetLastError(void)
 ******************************************************************************/
 void vTraceClearError(int resetErrorMessage)
 {
+	( void ) resetErrorMessage;
 	traceErrorMessage = NULL;	
 	RecorderDataPtr->internalErrorOccured = 0;
 }
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h
index 519735094e..0ae6fa9090 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h
@@ -52,8 +52,10 @@
 	#error FreeRTOS.h must be included before FreeRTOS_Sockets.h.
 #endif
 
-#ifndef TASK_H
-	#error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h.
+#ifndef INC_TASK_H
+	#ifndef TASK_H /* For compatibility with older FreeRTOS versions. */
+		#error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h.
+	#endif
 #endif
 
 /* Assigned to an xSocket_t variable when the socket is not valid, probably