Final fixes for spaces.