Various fixes to new timeline structure