Fixes for usb buffering