Fix up all time formatting