time & domain fixes