Scaffolding Bugfixes