misc restore related changes