Fix some more html_safe problems