Fixes for Scaffolding compatibility, PDF export, etc.

Fixed in this release