Fixed a few space issues