CDN fixes