USB and a few fixes