scaffolding fixes