Fixing issues with the VCL template.