diff --git a/src/diagnostics.cpp b/src/diagnostics.cpp
index c9d62e03f..444eb6efd 100644
--- a/src/diagnostics.cpp
+++ b/src/diagnostics.cpp
@@ -367,7 +367,7 @@ static void sendPartialMessage(long timestamp,
 
     int numWritten = snprintf(messageBuffer,
             MAX_MULTI_FRAME_MESSAGE_SIZE,
-            "{\"timestamp\":%ld,\"frame\":%d,\"message_id\":%d,\"bus\":%d,\"total_size\":%d,\"mode\":%d,\"pid\":%d,\"value\":%d",
+            "{\"timestamp\":%ld,\"frame\":%d,\"id\":%d,\"bus\":%d,\"total_size\":%d,\"mode\":%d,\"pid\":%d,\"value\":%d",
             timestamp,
             frame,
             message_id+8,
diff --git a/src/platform/pic32/usb.cpp b/src/platform/pic32/usb.cpp
index 34a6a82e5..387d1465d 100644
--- a/src/platform/pic32/usb.cpp
+++ b/src/platform/pic32/usb.cpp
@@ -146,7 +146,7 @@ void openxc::interface::usb::processSendQueue(UsbDevice* usbDevice) {
         UsbEndpoint* endpoint = &usbDevice->endpoints[i];
 
         // Don't touch usbDevice->sendBuffer if there's still a pending transfer
-        if(waitForHandle(usbDevice, endpoint)) {
+        if(!waitForHandle(usbDevice, endpoint)) {
             return;
         }