Fixes to dates