Fix some scaffolding issues.