diff --git a/Demos/Device/DualCDC/DualCDC.c b/Demos/Device/DualCDC/DualCDC.c
index 5d2dd5f9039d56d7dcd6fa5173942a65f9d50f59..4185a76bd7499bdc19096c5eed171af69d105b7c 100644
--- a/Demos/Device/DualCDC/DualCDC.c
+++ b/Demos/Device/DualCDC/DualCDC.c
@@ -207,7 +207,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 				Endpoint_ClearSETUP();
 
 				/* Write the line coding data to the control endpoint */
-				Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t), Endpoint_MemSpaceCallback_RAM);
+				Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));
 				
 				/* Finalize the stream transfer to send the last packet or clear the host abort */
 				Endpoint_ClearOUT();
@@ -304,7 +304,7 @@ TASK(CDC1_Task)
 		Endpoint_SelectEndpoint(CDC1_TX_EPNUM);
 
 		/* Write the String to the Endpoint */
-		Endpoint_Write_Stream_LE(ReportString, strlen(ReportString), Endpoint_MemSpaceCallback_RAM);
+		Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));
 		
 		/* Finalize the stream transfer to send the last packet */
 		Endpoint_ClearIN();
@@ -351,7 +351,7 @@ TASK(CDC2_Task)
 		Endpoint_SelectEndpoint(CDC2_TX_EPNUM);
 		
 		/* Write the received data to the endpoint */
-		Endpoint_Write_Stream_LE(&Buffer, DataLength, Endpoint_MemSpaceCallback_RAM);
+		Endpoint_Write_Stream_LE(&Buffer, DataLength);
 
 		/* Finalize the stream transfer to send the last packet */
 		Endpoint_ClearIN();
diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c
index 9056c0578be277e9c0f37e3e2b5c3a2a7e6ad5b8..15006d336a619700d40ea832f2c10f982d007875 100644
--- a/Demos/Host/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/MassStorageHost/MassStorageHost.c
@@ -408,7 +408,7 @@ void UpdateStatus(uint8_t CurrentStatus)
  */
 void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode)
 {
-	if (CommandFailed)
+	if (FailedAtSCSILayer)
 	{
 		/* Display the error code */
 		printf_P(PSTR(ESC_BG_RED "SCSI command error (%S).\r\n"), CommandString);