More fixes to time settings