Fix some more scaffolding issues.
Fix some more of the issues with scaffolding.