some date order fixes