Some improvements; both syncs are working for VMs