Added temporary code to normalize date fields.