Sprint 20: Fix date diffs