Migration Operator bug fixes 1