[PATCH v2 0/3] Further migration fixes