More changes to compile correctly DATE-releated code

No match.