Fixed build issues due to time series changes