Timeline bugfixes