Fixup start/end dates