Further improvements to site scaffolding.