Fixes for virtual hosts