More spacing fixes