more scaffolding mod fixes