diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 077937540d..a97bc234b8 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -34,7 +34,7 @@ gtkardour.Merge ([
     libraries['libgnomecanvas2'],
     libraries['libgnomecanvasmm'],
     libraries['sysmidi'],
-    libraries['sndfile'],
+    libraries['sndfile-ardour'],
     libraries['flac'],
     libraries['lrdf'],
     libraries['glibmm2'],
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 9b04a9d0d4..50f58b827c 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -311,7 +311,7 @@ AutomationLine::set_height (guint32 h)
 	if (h != _height) {
 		_height = h;
 
-		uint32_t bsz = control_point_box_size();
+		double bsz = control_point_box_size();
 
 		for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
 			(*i)->set_size (bsz);
@@ -671,7 +671,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 	uint32_t this_ry = 0;
  	uint32_t prev_ry = 0;	
 	double* slope;
-	double box_size;
+	uint32_t box_size;
 	uint32_t cpsize;
 
 	/* hide all existing points, and the line */
@@ -701,7 +701,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 		slope[n] = ydelta/xdelta;
 	}
 
-	box_size = control_point_box_size ();
+	box_size = (uint32_t) control_point_box_size ();
 
 	/* read all points and decide which ones to show as control points */