Fixes for USB Version