Hydrator strategy fixes