More stripped whitespace fixes