diff --git a/build/fs/password b/build/fs/password
index 2bb12de..c60c2de 100644
--- a/build/fs/password
+++ b/build/fs/password
@@ -1,5 +1,5 @@
 system:system:system:777777
 ken:ken:ken:10
-dmr:dmr:dmr:12
-bwk:bwk:bwk:14
-doug:doug:doug:15
+dmr:dmr:dmr:11
+bwk:bwk:bwk:12
+doug:doug:doug:14
diff --git a/build/proto b/build/proto
index 123cc60..2c0bbfb 100644
--- a/build/proto
+++ b/build/proto
@@ -58,7 +58,7 @@ dd           drwr- -1 4
         stat     frwr- -1 bin/stat
         tm       frwr- -1 bin/tm
         un       frwr- -1 bin/un
-    $
+	$
     ken      drwr- 10
       system l----  3
       sop.s      frwr- 10 ../src/sys/sop.s
@@ -74,27 +74,27 @@ dd           drwr- -1 4
       trysys.s   frwr- 10 ../src/sys/trysys.s
       sys.rc     frwr- 10 fs/sys.rc
       $
-    dmr        drwr- 12
+    dmr        drwr- 11
       system   l----  3
-      as.s     frwr- 12 ../src/cmd/as.s
-      op.s     frwr- 12 ../src/cmd/op.s
+      as.s     frwr- 11 ../src/cmd/as.s
+      op.s     frwr- 11 ../src/cmd/op.s
       $
-    bwk        drwr- 14
+    bwk        drwr- 12
       system   l----  3
-      b_readme frwr- 14 fs/b_readme
-      bi.s     frwr- 14 ../src/cmd/bi.s
-      bl.s     frwr- 14 ../src/cmd/bl.s
-      db.s     frwr- 14 ../src/cmd/db.s
-      hello.b  frwr- 14 ../src/other/hello.b
+      b_readme frwr- 12 fs/b_readme
+      bi.s     frwr- 12 ../src/cmd/bi.s
+      bl.s     frwr- 12 ../src/cmd/bl.s
+      db.s     frwr- 12 ../src/cmd/db.s
+      hello.b  frwr- 12 ../src/other/hello.b
       $
-    doug       drwr- 15
+    doug       drwr- 14
       system   l----  3
-      t1.s     frwr- 15 ../src/cmd/t1.s
-      t2.s     frwr- 15 ../src/cmd/t2.s
-      t3.s     frwr- 15 ../src/cmd/t3.s
-      t4.s     frwr- 15 ../src/cmd/t4.s
-      t5.s     frwr- 15 ../src/cmd/t5.s
-      t6.s     frwr- 15 ../src/cmd/t6.s
-      t7.s     frwr- 15 ../src/cmd/t7.s
-      t8.s     frwr- 15 ../src/cmd/t8.s
+      t1.s     frwr- 14 ../src/cmd/t1.s
+      t2.s     frwr- 14 ../src/cmd/t2.s
+      t3.s     frwr- 14 ../src/cmd/t3.s
+      t4.s     frwr- 14 ../src/cmd/t4.s
+      t5.s     frwr- 14 ../src/cmd/t5.s
+      t6.s     frwr- 14 ../src/cmd/t6.s
+      t7.s     frwr- 14 ../src/cmd/t7.s
+      t8.s     frwr- 14 ../src/cmd/t8.s
       $
diff --git a/tools/fsck7 b/tools/fsck7
index 968ae0d..85dd789 100755
--- a/tools/fsck7
+++ b/tools/fsck7
@@ -213,8 +213,8 @@ sub print_direntry {
     # Warn about empty filename
     $name= "EMPTY FILENAME" if ($name=~ m{/$});
 
-    printf( "%4d %s%s%s%s%s %2d %3d %5d %s\n",
-        $inum, $p1, $p2, $p3, $p4, $p5, $links, $uid, $size, $name );
+    printf( "%4d %s%s%s%s%s %2d %3o %5d %s\n",
+        $inum, $p1, $p2, $p3, $p4, $p5, $links, $uid & 0777, $size, $name );
 }
 
 # Given a directory's i-num and name, check it
diff --git a/tools/mkfs7 b/tools/mkfs7
index ac6775e..a3a01d6 100755
--- a/tools/mkfs7
+++ b/tools/mkfs7
@@ -221,7 +221,7 @@ sub fill_inode {
     $Block[$blocknum][ $offset + I_FLAGS ] = $flags;
 
     dprintf( "Fill inum %d: flags %06o uid %06o size %d (%06o)=> blk %d off %d\n",
-        $inum, $flags, $uid, $size, $size, $blocknum, $offset );
+        $inum, $flags, $uid & 0777, $size, $size, $blocknum, $offset );
     return ($inum);
 }
 
@@ -369,7 +369,7 @@ sub make_dir {
 	dprint("Added a .. entry to ourselves\n");
       }
     }
-    dprintf( "Made directory %s perms %06o uid %d in inum %d\n\n",
+    dprintf( "Made directory %s perms %06o uid %06o in inum %d\n\n",
         $dirname, $perms, $uid, $inum );
 }
 
@@ -442,7 +442,7 @@ sub write_file {
 # the dirstack.
 sub add_file {
     my ( $name, $perms, $uid, $extfile, $inum ) = @_;
-    dprintf( "Adding file %s perms %06o uid %d extfile %s\n",
+    dprintf( "Adding file %s perms %06o uid %06o extfile %s\n",
         $name, $perms, $uid, $extfile );
 
     # Read the file into a buffer
@@ -543,17 +543,17 @@ sub parse_proto_file {
 
         if ( $type eq I_DIRECTORY ) {
             my ( $name, $permstr, $uid, $inum ) = @words;
-            make_dir( $name, $perms, $uid, $inum );
+            make_dir( $name, $perms, oct($uid), $inum );
             next;
         }
         if ( $type eq I_FILE ) {
             my ( $name, $permstr, $uid, $extfile, $inum ) = @words;
-            add_file( $name, $perms, $uid, $extfile, $inum );
+            add_file( $name, $perms, oct($uid), $extfile, $inum );
             next;
         }
         if ( $type eq I_SPECIAL ) {
             my ( $name, $permstr, $uid, $inum ) = @words;
-            add_special( $name, $perms, $uid, $inum );
+            add_special( $name, $perms, oct($uid), $inum );
             next;
         }
         if ( $type eq I_LINK ) {