Cdn fixes