MOre CDN fixups.