Re: [GIT PULL] vhost: cleanups and fixes