WP-1858 print fixes
WP-1858