diff --git a/src/comp/syntax/codemap.rs b/src/comp/syntax/codemap.rs
index 34b5a02112f3..6df2f2422ad9 100644
--- a/src/comp/syntax/codemap.rs
+++ b/src/comp/syntax/codemap.rs
@@ -63,7 +63,10 @@ fn emit_diagnostic(&option::t[span] sp, &str msg, &str kind, u8 color,
     alt (sp) {
         case (some(?ssp)) {
             ss = span_to_str(ssp, cm);
-            maybe_lines = some(span_to_lines(ssp, cm));
+
+            // FIXME: we're not able to look up lines read from .rc files yet.
+            // maybe_lines = some(span_to_lines(ssp, cm));
+
         }
         case (none) { }
     }
diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py
index 627df6b7f8ef..d5c2ec8773f8 100755
--- a/src/etc/combine-tests.py
+++ b/src/etc/combine-tests.py
@@ -25,7 +25,8 @@ for t in os.listdir(run_pass):
     if t.endswith(".rs"):
         f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
         s = f.read()
-        if not ("xfail-stage2" in s):
+        if not ("xfail-stage2" in s or
+                "xfail-fast" in s):
             stage2_tests.append(t)
             if "main(vec[str] args)" in s:
                 take_args[t] = True
diff --git a/src/test/run-pass/global-scope.rs b/src/test/run-pass/global-scope.rs
index a3e3eb1a2bdc..6765efea5317 100644
--- a/src/test/run-pass/global-scope.rs
+++ b/src/test/run-pass/global-scope.rs
@@ -1,4 +1,5 @@
 // xfail-stage0
+// xfail-fast
 
 fn f() -> int { ret 1; }