Small fixes for Timeline