fixing a few bugs from usb migration