Fixes for print/pdf versions