Fix some XSS issues