date formatting fixes