Whitespace fixes
Support for Tito tickets