Fixes for PDF/HTML Exporters