Better handling of VM's prior to registration.