diff --git a/configure b/configure
index 0671a8f3955..2f3f5e4c035 100755
--- a/configure
+++ b/configure
@@ -267,7 +267,7 @@ probe_need CFG_AUTOCONF213 autoconf213  \
                            autoconf2.13 \
                            autoconf-2.13
 
-if [ ! -z "$CFG_ENABLE_LOCAL_RUST" ]
+if [ ! -z "$CFG_LOCAL_RUST_ROOT" ]
 then
     if [ ! -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc ]
     then
@@ -275,7 +275,7 @@ then
     else
         LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc --version`
         step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: " $LRV
-	CFG_RUSTC = ${CFG_LOCAL_RUST_ROOT}/bin/rustc
+	CFG_RUSTC=${CFG_LOCAL_RUST_ROOT}/bin/rustc
     fi
 else
     probe_need CFG_RUSTC rustc
@@ -392,6 +392,7 @@ putvar CFG_CONFIGURE_ARGS
 putvar CFG_C_COMPILER
 putvar CFG_SUBMODULES
 putvar CFG_DISABLE_MANAGE_SUBMODULES
+putvar CFG_RUSTC
 
 msg
 copy_if_changed ${CFG_SRC_DIR}Makefile.in ${CFG_BUILD_DIR}Makefile
diff --git a/src/servo/layout/box_builder.rs b/src/servo/layout/box_builder.rs
index a916b8793fa..69e8a66b744 100644
--- a/src/servo/layout/box_builder.rs
+++ b/src/servo/layout/box_builder.rs
@@ -75,7 +75,7 @@ priv fn simulate_UA_display_rules(node: Node) -> CSSDisplay {
 }
 
 impl BoxGenerator {
-    static pub pure fn new(flow: @FlowContext) -> BoxGenerator {
+    static pure fn new(flow: @FlowContext) -> BoxGenerator {
         unsafe { debug!("Creating box generator for flow: %s", flow.debug_str()); }
         BoxGenerator {
             flow: flow,
diff --git a/src/servo/text/font.rs b/src/servo/text/font.rs
index 4612268da1c..24d25232636 100644
--- a/src/servo/text/font.rs
+++ b/src/servo/text/font.rs
@@ -63,7 +63,7 @@ struct RunMetrics {
 
 impl Font {
     // TODO: who should own fontbuf?
-    static pub fn new(lib: @FontCache, fontbuf: @~[u8], native_font: NativeFont) -> Font {
+    static fn new(lib: @FontCache, fontbuf: @~[u8], native_font: NativeFont) -> Font {
         let metrics = native_font.get_metrics();
 
         Font {
diff --git a/src/servo/text/text_run.rs b/src/servo/text/text_run.rs
index 07440cbea31..1ff24ca9c7b 100644
--- a/src/servo/text/text_run.rs
+++ b/src/servo/text/text_run.rs
@@ -40,7 +40,7 @@ impl SendableTextRun {
 }
 
 impl TextRun {
-    static pub fn new(font: @Font, text: ~str) -> TextRun {
+    static fn new(font: @Font, text: ~str) -> TextRun {
         let glyph_store = GlyphStore(text.len());
         let run = TextRun {
             text: move text,