Fix scaffolding