Date fields fixed