Bufixes on timeline