Another bunch of timeline optimizations