More fixes for incorrect spacing