Whitespace/diff fixes