diff --git a/Demos/Device/CDC/Descriptors.c b/Demos/Device/CDC/Descriptors.c
index 70c885fe5e..c147546f1b 100644
--- a/Demos/Device/CDC/Descriptors.c
+++ b/Demos/Device/CDC/Descriptors.c
@@ -51,7 +51,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
 	.SubClass               = 0x00,
 	.Protocol               = 0x00,
 				
-	.Endpoint0Size          = 8,//FIXED_CONTROL_ENDPOINT_SIZE,
+	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 		
 	.VendorID               = 0x03EB,
 	.ProductID              = 0x2044,
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index f02bb56a08..6ecadb00d8 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -118,8 +118,6 @@ static void USB_Device_SetAddress(void)
 {
 	Endpoint_ClearSETUP();
 	
-	while (!(Endpoint_IsINReady()));
-	
 	Endpoint_ClearIN();
 	
 	while (!(Endpoint_IsINReady()));
@@ -299,7 +297,7 @@ static void USB_Device_ClearSetFeature(void)
 					}
 					else
 					{
-						Endpoint_StallTransaction();						
+						Endpoint_StallTransaction();
 					}
 				}
 			}
@@ -313,9 +311,6 @@ static void USB_Device_ClearSetFeature(void)
 	Endpoint_ClearSETUP();
 
 	Endpoint_ClearIN();
-
-	while (!(Endpoint_IsOUTReceived()));
-	Endpoint_ClearOUT();
 }
 
 #endif