Some updates to print/pdf diagnostic