loads of fixes for the CDN call