diff --git a/fuse/image.rs b/fuse/image.rs
index ae8bf6f88a..cb1356aadb 100644
--- a/fuse/image.rs
+++ b/fuse/image.rs
@@ -2,8 +2,7 @@ use std::fs::{File, OpenOptions};
 use std::io::{Read, Write, Seek, SeekFrom};
 
 use redoxfs::Disk;
-
-use system::error::{Error, Result, EIO};
+use syscall::error::{Error, Result, EIO};
 
 macro_rules! try_disk {
     ($expr:expr) => (match $expr {
diff --git a/fuse/main.rs b/fuse/main.rs
index 99f6b76ae8..0e01b11c85 100644
--- a/fuse/main.rs
+++ b/fuse/main.rs
@@ -2,7 +2,7 @@
 
 extern crate fuse;
 extern crate redoxfs;
-extern crate system;
+extern crate syscall;
 extern crate time;
 
 use image::Image;
diff --git a/scheme/main.rs b/scheme/main.rs
index d739091a64..d3a7a51455 100644
--- a/scheme/main.rs
+++ b/scheme/main.rs
@@ -48,10 +48,11 @@ fn main() {
                             let scheme = FileScheme::new(fs);
                             loop {
                                 let mut packet = Packet::default();
-                                while socket.read(&mut packet).unwrap() == size_of::<Packet>() {
-                                    scheme.handle(&mut packet);
-                                    socket.write(&packet).unwrap();
-                                }
+                                socket.read(&mut packet).unwrap();
+                                println!("file: {:?}", packet);
+                                scheme.handle(&mut packet);
+                                println!("file: ={}", packet.a);
+                                socket.write(&packet).unwrap();
                             }
                         },
                         Err(err) => println!("redoxfs: failed to create file scheme: {}", err)
diff --git a/src/filesystem.rs b/src/filesystem.rs
index 1c36f83b29..9c77d15714 100644
--- a/src/filesystem.rs
+++ b/src/filesystem.rs
@@ -14,7 +14,7 @@ pub struct FileSystem {
 impl FileSystem {
     /// Open a file system on a disk
     pub fn open(mut disk: Box<Disk>) -> Result<Self> {
-        for block in 0..8192 {
+        for block in 0..65536 {
             let mut header = (0, Header::default());
             try!(disk.read_at(block + header.0, &mut header.1));
 
diff --git a/utility/image.rs b/utility/image.rs
index ae8bf6f88a..cb1356aadb 100644
--- a/utility/image.rs
+++ b/utility/image.rs
@@ -2,8 +2,7 @@ use std::fs::{File, OpenOptions};
 use std::io::{Read, Write, Seek, SeekFrom};
 
 use redoxfs::Disk;
-
-use system::error::{Error, Result, EIO};
+use syscall::error::{Error, Result, EIO};
 
 macro_rules! try_disk {
     ($expr:expr) => (match $expr {
diff --git a/utility/main.rs b/utility/main.rs
index b8c0b471e2..9fe6c439c0 100644
--- a/utility/main.rs
+++ b/utility/main.rs
@@ -1,8 +1,7 @@
 #![deny(warnings)]
 
 extern crate redoxfs;
-
-extern crate system;
+extern crate syscall;
 
 use std::env;
 use std::io::{self, Write};