Fix live migration bugs