Fixing those Scaffold auto-changes