diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 03e37c53a5d..a6362baa71c 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -51,7 +51,7 @@ use servo_msg::constellation_msg::ConstellationChan;
 use servo_util::smallvec::{SmallVec1, SmallVec};
 use servo_util::str::LengthOrPercentageOrAuto;
 use std::cell::{Cell, RefCell};
-use std::collections::hashmap::HashMap;
+use std::collections::HashMap;
 use std::comm::{Receiver, Sender};
 use std::io::timer::Timer;
 use std::rc::Rc;
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 61431f16af5..c6f4b636d50 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -494,7 +494,7 @@ impl ScriptTask {
                     needs_reflow.insert(id);
                 }
                 FromConstellation(ViewportMsg(id, rect)) => {
-                    let mut page = self.page.borrow_mut();
+                    let page = self.page.borrow_mut();
                     let inner_page = page.find(id).expect("Page rect message sent to nonexistent pipeline");
                     if inner_page.set_page_clip_rect_with_new_viewport(rect) {
                         needs_reflow.insert(id);
@@ -535,7 +535,7 @@ impl ScriptTask {
                 FromConstellation(ReflowCompleteMsg(id, reflow_id)) => self.handle_reflow_complete_msg(id, reflow_id),
                 FromConstellation(ResizeInactiveMsg(id, new_size)) => self.handle_resize_inactive_msg(id, new_size),
                 FromConstellation(ExitPipelineMsg(id)) => if self.handle_exit_pipeline_msg(id) { return false },
-                FromConstellation(ViewportMsg(..)) => fail!("should have handled ViewportMsg already"),
+                FromConstellation(ViewportMsg(..)) => panic!("should have handled ViewportMsg already"),
                 FromScript(ExitWindowMsg(id)) => self.handle_exit_window_msg(id),
                 FromConstellation(ResizeMsg(..)) => panic!("should have handled ResizeMsg already"),
                 FromScript(XHRProgressMsg(addr, progress)) => XMLHttpRequest::handle_progress(addr, progress),