Tab-spacing fixes