Bug fixes (print and PDF)