fixes for scaffolding.