Some tweaks for print and HTML output