Fix two problems in the scaffolding.