Misc timeline fixes