diff --git a/src/libmdb/data.c b/src/libmdb/data.c
index 1cbc066..432c82f 100644
--- a/src/libmdb/data.c
+++ b/src/libmdb/data.c
@@ -263,6 +263,7 @@ static char text[256];
 			strncpy(text, &mdb->pg_buf[start], size);
 			text[size]='\0';
 			return text;
+		break;
 		case MDB_MEMO:
 			if (size<MDB_MEMO_OVERHEAD) {
 				return "";
@@ -272,6 +273,9 @@ static char text[256];
 			text[size - MDB_MEMO_OVERHEAD]='\0';
 			return text;
 		break;
+		default:
+			return "";
+		break;
 	}
 	return NULL;
 }
diff --git a/src/libmdb/table.c b/src/libmdb/table.c
index 20b4ba7..8061c67 100644
--- a/src/libmdb/table.c
+++ b/src/libmdb/table.c
@@ -42,7 +42,7 @@ int len, i;
 
 	table->num_rows = mdb_get_int32(mdb,12);
 	table->num_cols = mdb_get_int16(mdb,25);
-	table->num_pgs = mdb_get_int32(mdb,27);
+	table->num_pgs = mdb_get_int32(mdb,31);
 	table->first_data_pg = mdb_get_int16(mdb,36);
 
 	return table;
diff --git a/src/util/prtable.c b/src/util/prtable.c
index 6d642a7..dc0637a 100644
--- a/src/util/prtable.c
+++ b/src/util/prtable.c
@@ -42,7 +42,8 @@ GList *l;
 
 	for (i=0;i<mdb->num_catalog;i++) {
 		entry = g_array_index(mdb->catalog,MdbCatalogEntry,i);
-		if (!strcmp(entry.object_name,argv[2])) {
+		if (entry.object_type == MDB_TABLE &&
+			!strcmp(entry.object_name,argv[2])) {
 				mdb_table_dump(&entry);
 		}
 	}