Whitespace generation fixes

Andrea Zoppi