More fixes for Time