Fixing some potential XSS issues.