Fixes to whitespace woes