More fixes to time series data