some domain fixes