A few minor modifications to hypervisor.py.