CNAME is back, many fixes