Fixes for the vhosts