More scaffolding changes