Fix time formatting to be consistent