Tweaks to handling of missing dates