Updating how we handle domain mapping issues