Mitigating Time-Stream Discontinuities