More changes for our custom domain

A few changes I missed from the last commit.