Various spacing fixes.