fix handling of date defaults (hit some probs with Core & also use of static function in core makes it hard to backport so not touched in core