Fix various small whitespace things