Fixed date and dateTime errors