Migration last fixes