Fixing the date formatting issues