diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp
index 8b4a442d6..3b7b74d8d 100644
--- a/src/gui/widgets/timeline-widget.cpp
+++ b/src/gui/widgets/timeline-widget.cpp
@@ -284,7 +284,8 @@ TimelineWidget::update_tracks()
   
   // Recalculate the total height of the timeline scrolled area
   totalHeight = 0;
-  BOOST_FOREACH(shared_ptr<model::Track> track, sequence->get_child_tracks())
+  BOOST_FOREACH(shared_ptr<model::Track> track,
+    sequence->get_child_tracks())
     {
       ASSERT(track);
       totalHeight += measure_branch_height(track);
@@ -296,8 +297,9 @@ TimelineWidget::create_timeline_tracks()
 {
   REQUIRE(sequence);
   
-  BOOST_FOREACH(shared_ptr<model::Track> child, sequence->get_child_tracks())
-    create_timeline_tracks_from_branch(child);
+  BOOST_FOREACH(shared_ptr<model::Track> child,
+    sequence->get_child_tracks())
+    create_timeline_tracks_from_branch(sequence);
 }
 
 void
@@ -416,8 +418,11 @@ TimelineWidget::measure_branch_height(
   // Recurse through all the children  
   BOOST_FOREACH( shared_ptr<model::Track> child,
     model_track->get_child_tracks() )
-    height += measure_branch_height(child);
-  
+    {
+      ASSERT(child != NULL);
+      height += measure_branch_height(child);
+    }
+    
   return height;
 }
 
diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp
index aa9d76358..c9330d109 100644
--- a/src/gui/widgets/timeline/timeline-header-container.cpp
+++ b/src/gui/widgets/timeline/timeline-header-container.cpp
@@ -70,7 +70,7 @@ TimelineHeaderContainer::update_headers()
 {    
   // Add fresh headers  
   BOOST_FOREACH( shared_ptr<model::Track> model_track, get_tracks() )
-      set_parent_recursive(model_track);
+    set_parent_recursive(model_track);
 }
   
 void