Minor scaffolding updates