Fixed a couple of migration dependency issues