Fixed date format issues