Another collection of spacing fixes
A few more spacing fixes