Fixing Dates issues from incoming json