Dates persisting related issues fixed