More CDN changes