Fixing some scaffolding