Fix CNAME issues