Time series fixes by Seshika