Changes related to machine migration