Times always display correctly

Minor bug fixes