Final spacing fixes