More fixes for timeline