CNAME and other changes