Fixup for setting date values