.ProductStrIndex        = 0x02,\r
        .SerialNumStrIndex      = NO_DESCRIPTOR,\r
                \r
-       .NumberOfConfigurations = 1\r
+       .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r
 \r
        .MouseHID = \r
                {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
-                                                                        \r
+                       .Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
+\r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        .TotalReportDescriptors = 1,\r
        .MouseEndpoint = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
-                                                                                \r
+\r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | MOUSE_EPNUM),\r
-                       .Attributes             = EP_TYPE_INTERRUPT,\r
+                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = MOUSE_EPSIZE,\r
-                       .PollingIntervalMS      = 0x02\r
-               }       \r
+                       .PollingIntervalMS      = 0x0A\r
+               }\r
 };\r
 \r
 /** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests\r
                        break;\r
                case DTYPE_HID: \r
                        Address = (void*)&ConfigurationDescriptor.MouseHID;\r
-                       Size    = sizeof(USB_Descriptor_HID_t);\r
+                       Size    = sizeof(USB_HID_Descriptor_t);\r
                        break;\r
                case DTYPE_Report: \r
                        Address = (void*)&MouseReport;\r