Fixing some small XSS vulnerabilities