Fixes whitespace issues

These issues were introduced in two previous merges.