More vhost fixup