Various fixes for VCL updates...just before they disabled custom VCL for our account