Fixes to html output