Whitespace handling adjustments