Some spacing fixes