Time series fixes