A bunch of nice fixes.