Fix Date serialization