Some more migration updates