More fixes for usbdisks