Lazy spacing fixes