Fixes to spacing