html safe fixes