[PATCH 0/3] Fix migration bugs