Time series expected values fixes