Misc USB shell fixes