Prepare for M2->M3 move