Fix Date saving and handling