diff --git a/ChangeLog b/ChangeLog
index a5ae35a1a..174304150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-11  Matthew Crosby  <mcrosby@marthon.org>
+
+	* src/pcd/pcfread.c: removed some compilation warnings related
+	to comparison of signed vs. unsigned integers
+
+	* include/freetype/internal/ftdebug.h: changed the debug trace
+	constants from trace_t2xxxx to trace_cffxxxx to be able to compile
+	the CFF driver in debug mode
+
 2001-01-11  Matthew Crosby  <mcrosby@marthon.org>
 
 	* builds/unix/freetype-config.in: Fix problems with separate
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index d42e7f08b..db905ed3e 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -82,11 +82,11 @@ FT_BEGIN_HEADER
     trace_psobjs,
 
     /* Type 2 driver components */
-    trace_t2driver,
-    trace_t2gload,
-    trace_t2load,
-    trace_t2objs,
-    trace_t2parse,
+    trace_cffdriver,
+    trace_cffgload,
+    trace_cffload,
+    trace_cffobjs,
+    trace_cffparse,
 
     /* CID driver components */
     trace_cidafm,
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index c6b497007..0d5dec467 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -117,8 +117,8 @@ THE SOFTWARE.
 #if defined( FT_DEBUG_LEVEL_TRACE )
 
     {
-      int    i,j;
-      char*  name;
+      unsigned int  i,j;
+      char*         name = "?";
 
 
       FT_TRACE4(( "Tables count: %ld\n", face->toc.count ));
@@ -126,7 +126,7 @@ THE SOFTWARE.
       for ( i = 0; i < toc->count; i++ )
       {
         for( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] ); j++ )
-          if ( tables[i].type == ( 1 << j ) )
+          if ( tables[i].type == (unsigned int)( 1 << j ) )
             name=tableNames[j];
         FT_TRACE4(( "Table %d: type=%-6s format=0x%04lX "
                     "size=0x%06lX (%8ld) offset=0x%04lX\n",