Various spacing fixes