HTML output fixes