Fix a bunch of more issues with the scaffolding.