Fix some scaffolding problems.