More minor spacing fixes