some obvious fixes
Workaround for nasty literal HTML inserting issue.