diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c
index f2e4d46445..6f8aa51799 100644
--- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c
+++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c
@@ -81,7 +81,7 @@ void SImage_SendBlockHeader(void)
 /** Function to receive a PIMA event container from the attached still image device.
  *
  *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum
- /
+ */
 uint8_t SImage_ReceiveEventHeader(void)
 {
 	uint8_t ErrorCode;
diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c
index e284492a45..cf9dc1ebb2 100644
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -112,7 +112,7 @@ uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo
 			{
 				if (Pipe_IsEndpointBound(EndpointData->EndpointAddress))
 				{
-					BidirectionalDataEndpoints = true;
+					CDCInterfaceInfo->State.BidirectionalDataEndpoints = true;
 					Pipe_DisablePipe();
 				}
 
@@ -127,7 +127,7 @@ uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo
 			{
 				if (Pipe_IsEndpointBound(EndpointData->EndpointAddress))
 				{
-					BidirectionalDataEndpoints = true;
+					CDCInterfaceInfo->State.BidirectionalDataEndpoints = true;
 				}
 				else
 				{