Fix migration path
Fix a couple of regressions from the refactoring