Some tweaks to date-aware calculations