Fixed compilation errors that were a consequence of the vhost addition.
Merge branch 'virtualhost-fix' into next