Fix date time tools