Temporary XSS fixes
Merge pull request #2784 from nicolaasmatthijs/XSS

Temporary XSS fixes