Migration scenario bug fixes