Virtual host fixes