diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 0a9ad22de68..44b05eae273 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -578,6 +578,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
 
             (Msg::CreatePng(reply), ShutdownState::NotShuttingDown) => {
                 let res = self.composite_specific_target(CompositeTarget::WindowAndPng);
+                if let Err(ref e) = res {
+                    info!("Error retrieving PNG: {:?}", e);
+                }
                 let img = res.unwrap_or(None);
                 if let Err(e) = reply.send(img) {
                     warn!("Sending reply to create png failed ({}).", e);
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 5ee70b8b068..691d4c7606f 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -1124,7 +1124,9 @@ impl Window {
         // When all these conditions are met, notify the constellation
         // that this pipeline is ready to write the image (from the script thread
         // perspective at least).
-        if (opts::get().output_file.is_some() || opts::get().exit_after_load) && for_display {
+        if (opts::get().output_file.is_some() ||
+            opts::get().exit_after_load ||
+            opts::get().webdriver_port.is_some()) && for_display {
             let document = self.Document();
 
             // Checks if the html element has reftest-wait attribute present.
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index 48f4c0ad1ee..93de252bda6 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -772,7 +772,7 @@ impl Handler {
         let mut img = None;
         let pipeline_id = try!(self.root_pipeline());
 
-        let interval = 20;
+        let interval = 1000;
         let iterations = 30_000 / interval;
 
         for _ in 0..iterations {