More custom domain fixes