USB gadget fixes part 1