diff --git a/base64/base64.rs b/base64/base64.rs
index 54608cb8a..7b0e23e8e 100644
--- a/base64/base64.rs
+++ b/base64/base64.rs
@@ -11,7 +11,7 @@
 
 #[feature(macro_rules)];
 
-extern mod extra;
+extern mod serialize;
 extern mod getopts;
 
 use std::char;
@@ -25,8 +25,8 @@ use getopts::{
     optopt,
     usage
 };
-use extra::base64;
-use extra::base64::{FromBase64, ToBase64};
+use serialize::base64;
+use serialize::base64::{FromBase64, ToBase64};
 
 #[path = "../util.rs"]
 mod util;
diff --git a/tee/tee.rs b/tee/tee.rs
index 64842c4aa..72b9427f7 100644
--- a/tee/tee.rs
+++ b/tee/tee.rs
@@ -107,7 +107,7 @@ struct NamedWriter {
 
 impl Writer for NamedWriter {
     fn write(&mut self, buf: &[u8]) -> IoResult<()> {
-        with_path(self.path, || {
+        with_path(self.path.clone(), || {
             let val = self.inner.write(buf);
             if val.is_err() {
                 self.inner = ~NullWriter as ~Writer;
@@ -117,7 +117,7 @@ impl Writer for NamedWriter {
     }
 
     fn flush(&mut self) -> IoResult<()> {
-        with_path(self.path, || {
+        with_path(self.path.clone(), || {
             let val = self.inner.flush();
             if val.is_err() {
                 self.inner = ~NullWriter as ~Writer;