Minor fixes for CNAME