Fixes done to vhost templates and recipes