domain mapping fixes