Fixes for USB CDC and second console uart