dynamic domain fixes