Fix lot of migration untracked issues