Whitespace and similar fixes