Fix spacing glitches