Fixing dates
[BF] NB - please check and verify