Improve team member migration correctness