diff --git a/ChangeLog b/ChangeLog
index a858f243a..6802deba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-16  Werner Lemberg  <wl@gnu.org>
+
+	* src/type1/t1parse.h (T1_ParserRec): Change type of `base_len'
+	and `private_len' to FT_Long.
+
+	* src/cache/ftcsbits.c (ftc_sbit_node_load): Remove unused label.
+	* src/pshinter/pshalgo3.c (psh3_hint_align): Remove unused variable.
+
 2002-09-14  Werner Lemberg  <wl@gnu.org>
 
 	Making ftgrays.c compile stand-alone again.
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index b93d77746..33e44ea50 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -221,7 +221,6 @@
       }
     }
 
-  Exit:
     return error;
   }
 
diff --git a/src/pshinter/pshalgo3.c b/src/pshinter/pshalgo3.c
index 61745533a..4ee01715d 100644
--- a/src/pshinter/pshalgo3.c
+++ b/src/pshinter/pshalgo3.c
@@ -441,7 +441,6 @@
       FT_Pos  len = FT_MulFix( hint->org_len, scale );
 
       FT_Int            do_snapping;
-      FT_Pos            fit_center;
       FT_Pos            fit_len;
       PSH_AlignmentRec  align;
 
diff --git a/src/type1/t1parse.h b/src/type1/t1parse.h
index 1341493a7..ecc206739 100644
--- a/src/type1/t1parse.h
+++ b/src/type1/t1parse.h
@@ -64,10 +64,10 @@ FT_BEGIN_HEADER
     FT_Stream     stream;
 
     FT_Byte*      base_dict;
-    FT_Int        base_len;
+    FT_Long       base_len;
 
     FT_Byte*      private_dict;
-    FT_Int        private_len;
+    FT_Long       private_len;
 
     FT_Byte       in_pfb;
     FT_Byte       in_memory;