Fix date variables