Fix possible cross-confusion between serial / usb modes