ApexQ: misc USB/charging fixes