Better waiting and locking on vmadm.