diff --git a/src/rust-mozjs b/src/rust-mozjs
index 6dba36f7a8ab..7d72b513076c 160000
--- a/src/rust-mozjs
+++ b/src/rust-mozjs
@@ -1 +1 @@
-Subproject commit 6dba36f7a8ab7747a7ead4ed0b6c3f8a2e3382d4
+Subproject commit 7d72b513076c01196c30b09bee85d2c1a2817719
diff --git a/src/rust-opengles b/src/rust-opengles
index 90214523ec29..ee3f5d026385 160000
--- a/src/rust-opengles
+++ b/src/rust-opengles
@@ -1 +1 @@
-Subproject commit 90214523ec299ff13912831f60e200f9c0ae6261
+Subproject commit ee3f5d026385cb9ed933aba3cad2ee06bfc1ee1c
diff --git a/src/servo/gfx/renderer.rs b/src/servo/gfx/renderer.rs
index a4706bc4c727..ad5a6b92368d 100644
--- a/src/servo/gfx/renderer.rs
+++ b/src/servo/gfx/renderer.rs
@@ -30,7 +30,7 @@ each rendered frame and submit them to be drawn to the display
 
 FIXME: Change this name to Compositor.
 "]
-iface Sink {
+trait Sink {
     fn begin_drawing(+next_dt: pipes::chan<AzDrawTargetRef>);
     fn draw(+next_dt: pipes::chan<AzDrawTargetRef>, draw_me: AzDrawTargetRef);
     fn add_event_listener(listener: comm::chan<Event>);
diff --git a/src/servo/opts.rs b/src/servo/opts.rs
index 4631568b2319..f287e5e256eb 100644
--- a/src/servo/opts.rs
+++ b/src/servo/opts.rs
@@ -25,18 +25,18 @@ fn from_cmdline_args(args: ~[~str]) -> Opts {
         getopts::optopt(~"o")
     ];
 
-    let match = alt getopts::getopts(args, opts) {
+    let opt_match = alt getopts::getopts(args, opts) {
       result::ok(m) { copy m }
       result::err(f) { fail getopts::fail_str(f) }
     };
 
-    let urls = if match.free.is_empty() {
+    let urls = if opt_match.free.is_empty() {
         fail ~"servo asks that you provide 1 or more URLs"
     } else {
-        copy match.free
+        copy opt_match.free
     };
 
-    let render_mode = alt getopts::opt_maybe_str(match, ~"o") {
+    let render_mode = alt getopts::opt_maybe_str(opt_match, ~"o") {
       some(output_file) { Png(copy output_file) }
       none { Screen }
     };
diff --git a/src/servo/util/tree.rs b/src/servo/util/tree.rs
index 5d0b4f0b2629..f12c298b8890 100644
--- a/src/servo/util/tree.rs
+++ b/src/servo/util/tree.rs
@@ -10,11 +10,11 @@ type Tree<T> = {
     mut next_sibling: option<T>
 };
 
-iface ReadMethods<T> {
+trait ReadMethods<T> {
     fn with_tree_fields<R>(T, f: fn(Tree<T>) -> R) -> R;
 }
 
-iface WriteMethods<T> {
+trait WriteMethods<T> {
     fn with_tree_fields<R>(T, f: fn(Tree<T>) -> R) -> R;
 }