Fixes for whitespace