- fix some whitespace issues due to patching