Various fixes for libusb