Fix CDN Support