Fix some more whitespace issues