Fix USB support