diff --git a/ChangeLog b/ChangeLog
index 38493fb3b..20d4807f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-30  David Turner  <david@freetype.org>
+
+	* src/truetype/ttinterp.c: add missing variable initialization,
+	gets rid of Valgrind fixes.
+
+	* src/autofit/aflatin.c: get rid of an infinite loop in the case
+	of degenerate fonts.
+
 2007-06-26  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	Add autofit module for Indic scripts.  This currently just reuses
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 6b4e8c207..2ae9ec5a1 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -269,6 +269,7 @@
         /* now check whether the point belongs to a straight or round   */
         /* segment; we first need to find in which contour the extremum */
         /* lies, then inspect its previous and next points              */
+        if ( best_point >= 0 )
         {
           FT_Int  prev, next;
           FT_Pos  dist;
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 4e351474f..85c8529ac 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -6424,6 +6424,7 @@
       V.curs = (FT_Vector*)( (FT_Pos*)CUR.pts.cur + 1 );
       V.orus = (FT_Vector*)( (FT_Pos*)CUR.pts.orus + 1 );
     }
+    V.max_points = CUR.pts.n_points;
 
     contour = 0;
     point   = 0;