diff -ur ft2demos/src/ftdump.c ft2demos_compile/src/ftdump.c
--- ft2demos/src/ftdump.c	Sun Sep 10 10:38:06 2000
+++ ft2demos_compile/src/ftdump.c	Sun Sep 10 13:13:28 2000
@@ -101,7 +101,7 @@
     if ( FT_IS_SCALABLE( face ) )
       Print_Comma( "scalable" );
     if ( FT_HAS_MULTIPLE_MASTERS( face ) )
-      Print_Comma( "Multiple Master" );
+      Print_Comma( "multiple master" );
     if ( FT_HAS_FIXED_SIZES( face ) )
       Print_Comma( "fixed size" );
     printf( "\n" );
@@ -227,6 +227,8 @@
 
     /* Load face */
     error = FT_New_Face( library, filename, 0, &face );
+    if (error)
+      PanicZ( "Could not open face." );
 
   Success:
     num_faces = face->num_faces;
@@ -240,6 +242,8 @@
     for( i = 0; i < num_faces; i++ )
     {
       error = FT_New_Face( library, filename, i, &face );
+      if (error)
+	PanicZ( "Could not open face." );
 
       printf("\n----- Face number: %d -----\n\n", i);
       Print_Name( face );
diff -ur ft2demos/src/ftview.c ft2demos_compile/src/ftview.c
--- ft2demos/src/ftview.c	Sun Sep 10 10:38:06 2000
+++ ft2demos_compile/src/ftview.c	Sun Sep 10 13:07:35 2000
@@ -90,7 +90,7 @@
 
         x += ( glyph->advance.x >> 16 ) + 1;
 
-        if ( x > bit.width )
+        if ( x + size->metrics.x_ppem > bit.width )
         {
           x  = start_x;
           y += step_y;