Fixes for CDN