sorting out some migration dependency issues
2 files changed