More white space fixes