Additional CDN changes