More timeline fixes and cleanups