Fix some raw XSS in helper