More whitespace issues