ENH: Fixes for correct usb setup