Fix date errors