small tweaks - wait for the VM heartbeat