Fixes to dates
Fixed dates properly