CNAME & Fix

CNAME & Fix