diff --git a/src/lib.rs b/src/lib.rs
index ac4a5f45..7cecc37a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,7 +2,6 @@
 
 #![feature(phase)]
 #![feature(unsafe_destructor)]
-#![feature(old_orphan_check)]
 #![warn(missing_docs)]
 
 #[phase(plugin, link)] extern crate log;
diff --git a/src/result.rs b/src/result.rs
index aa1343a5..d18f113e 100644
--- a/src/result.rs
+++ b/src/result.rs
@@ -31,14 +31,6 @@ impl error::FromError<io::IoError> for ZipError
     }
 }
 
-impl<T> error::FromError<(T, io::IoError)> for ZipError
-{
-    fn from_error((_, err): (T, io::IoError)) -> ZipError
-    {
-        error::FromError::from_error(err)
-    }
-}
-
 impl error::Error for ZipError
 {
     fn description(&self) -> &str
diff --git a/src/writer.rs b/src/writer.rs
index 1aacca0f..6609cde6 100644
--- a/src/writer.rs
+++ b/src/writer.rs
@@ -223,7 +223,7 @@ impl<W: Writer+Seek> GenericZipWriter<W>
         {
             GenericZipWriter::Storer(w) => w,
             GenericZipWriter::Deflater(w) => try!(w.finish()),
-            GenericZipWriter::Bzip2(w) => try!(w.into_inner()),
+            GenericZipWriter::Bzip2(w) => match w.into_inner() { Ok(r) => r, Err((_, err)) => try!(Err(err)) },
             GenericZipWriter::Closed => try!(Err(io::standard_error(io::Closed))),
         };