First stab at fixing up USB 3.0 port issues - NEEDS TEST