Added a couple of fixes for the vhost client