Minor cleanup; CNAME