More fixes to time.