Borrow recent fixes from 3.4

Fixes boot hangs, (potential) modem issues, debuggery, etc.