CDN Fixes