fixing date format issues