More usb fixes