diff --git a/sys/Xusb.h b/sys/Xusb.h
index 62be17e..f785fe4 100644
--- a/sys/Xusb.h
+++ b/sys/Xusb.h
@@ -80,7 +80,7 @@ typedef struct _XUSB_DEVICE_DATA
     //
     // LED number (represents XInput slot index)
     //
-    UCHAR LedNumber;
+    CHAR LedNumber;
 
     //
     // Report packet
@@ -120,7 +120,7 @@ Bus_XusbSubmitReport(
 // 
 NTSTATUS Xusb_PreparePdo(PWDFDEVICE_INIT DeviceInit, USHORT VendorId, USHORT ProductId, PUNICODE_STRING DeviceId, PUNICODE_STRING DeviceDescription);
 NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device);
-NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION Description);
+NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device);
 VOID Xusb_GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length);
 VOID Xusb_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVICE_DATA pCommon);
 VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo);
diff --git a/sys/buspdo.c b/sys/buspdo.c
index d65a3d7..5e66306 100644
--- a/sys/buspdo.c
+++ b/sys/buspdo.c
@@ -395,7 +395,7 @@ NTSTATUS Bus_CreatePdo(
     {
     case Xbox360Wired:
 
-        status = Xusb_AssignPdoContext(hChild, Description);
+        status = Xusb_AssignPdoContext(hChild);
 
         break;
 
diff --git a/sys/xusb.c b/sys/xusb.c
index 0e01225..540ffd7 100644
--- a/sys/xusb.c
+++ b/sys/xusb.c
@@ -246,7 +246,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device)
     return STATUS_SUCCESS;
 }
 
-NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION Description)
+NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device)
 {
     NTSTATUS status;
     WDF_OBJECT_ATTRIBUTES attributes;
@@ -261,7 +261,7 @@ NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION
     RtlZeroMemory(xusb, sizeof(XUSB_DEVICE_DATA));
 
     // Is later overwritten by actual XInput slot
-    xusb->LedNumber = (UCHAR)Description->SerialNo;
+    xusb->LedNumber = -1;
     // Packet size (20 bytes = 0x14)
     xusb->Packet.Size = 0x14;
 
@@ -567,19 +567,22 @@ VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo)
 
 NTSTATUS Xusb_GetUserIndex(WDFDEVICE Device, PXUSB_GET_USER_INDEX Request)
 {
-    NTSTATUS                    status = STATUS_INVALID_PARAMETER;
+    NTSTATUS                    status = STATUS_INVALID_DEVICE_REQUEST;
     WDFDEVICE                   hChild;
     PPDO_DEVICE_DATA            pdoData;
+    CHAR                        userIndex;
 
 
-    KdPrint((DRIVERNAME "Entered Bus_QueueNotification\n"));
+    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, "%!FUNC! Entry");
 
     hChild = Bus_GetPdo(Device, Request->SerialNo);
 
     // Validate child
     if (hChild == NULL)
     {
-        KdPrint((DRIVERNAME "Bus_QueueNotification: PDO with serial %d not found\n", Request->SerialNo));
+        TraceEvents(TRACE_LEVEL_ERROR,
+            TRACE_XUSB,
+            "Bus_GetPdo for serial %d failed", Request->SerialNo);
         return STATUS_NO_SUCH_DEVICE;
     }
 
@@ -587,18 +590,32 @@ NTSTATUS Xusb_GetUserIndex(WDFDEVICE Device, PXUSB_GET_USER_INDEX Request)
     pdoData = PdoGetData(hChild);
     if (pdoData == NULL)
     {
-        KdPrint((DRIVERNAME "Bus_QueueNotification: PDO context not found\n"));
+        TraceEvents(TRACE_LEVEL_ERROR,
+            TRACE_XUSB,
+            "PdoGetData failed");
         return STATUS_INVALID_PARAMETER;
     }
 
     // Check if caller owns this PDO
     if (!IS_OWNER(pdoData))
     {
-        KdPrint((DRIVERNAME "Bus_QueueNotification: PID mismatch: %d != %d\n", pdoData->OwnerProcessId, CURRENT_PROCESS_ID()));
+        TraceEvents(TRACE_LEVEL_ERROR,
+            TRACE_XUSB,
+            "PID mismatch: %d != %d",
+            pdoData->OwnerProcessId,
+            CURRENT_PROCESS_ID());
         return STATUS_ACCESS_DENIED;
     }
 
-    Request->UserIndex = (ULONG)XusbGetData(hChild)->LedNumber;
+    userIndex = XusbGetData(hChild)->LedNumber;
+
+    if (userIndex >= 0)
+    {
+        Request->UserIndex = (ULONG)userIndex;
+        status = STATUS_SUCCESS;
+    }
+
+    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XUSB, "%!FUNC! Exit with status %!STATUS!", status);
 
     return status;
 }