Fix up usb to pass reliably and to work cross-platform