Server white space fixes