Fix usb related issues