All the fixes necessary for running 2 VMs demo.