Fix several trailing whitespace occurances