TimeSeries bugfixes

Fixed bugs #717, #731