Add cname and transition fixes