Minor updates to scaffolding