General spacing fixes