diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
index a18c0aa954..3b2af81ef1 100644
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
@@ -46,7 +46,7 @@
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
 {
 	/* Use the HID class driver's standard Vendor HID report.
-	 *  Vendor Usage Page: 1
+	 *  Vendor Usage Page: 0
 	 *  Vendor Collection Usage: 1
 	 *  Vendor Report IN Usage: 2
 	 *  Vendor Report OUT Usage: 3
diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index f44d7fc2e3..466efaf7fa 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -151,7 +151,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
 	Data[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0);
 	Data[3] = ((CurrLEDMask & LEDS_LED4) ? 1 : 0);
 
-	*ReportSize = sizeof(GENERIC_REPORT_SIZE);
+	*ReportSize = GENERIC_REPORT_SIZE;
 	return false;
 }
 
diff --git a/Demos/Device/LowLevel/GenericHID/Descriptors.c b/Demos/Device/LowLevel/GenericHID/Descriptors.c
index a981b93cea..79697ece96 100644
--- a/Demos/Device/LowLevel/GenericHID/Descriptors.c
+++ b/Demos/Device/LowLevel/GenericHID/Descriptors.c
@@ -45,7 +45,7 @@
  */
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
 {
-	HID_RI_USAGE_PAGE(16, 0xFF00), /* Vendor Page 1 */
+	HID_RI_USAGE_PAGE(16, 0xFF00), /* Vendor Page 0 */
 	HID_RI_USAGE(8, 0x01), /* Vendor Usage 1 */
 	HID_RI_COLLECTION(8, 0x01), /* Vendor Usage 1 */
 	    HID_RI_USAGE(8, 0x02), /* Vendor Usage 2 */