diff --git a/content/httpmonitor/remote/connection.js b/content/httpmonitor/remote/connection.js
index f856c47..eb7ccbd 100644
--- a/content/httpmonitor/remote/connection.js
+++ b/content/httpmonitor/remote/connection.js
@@ -13,7 +13,7 @@ var Cu = Components.utils;
 
 try
 {
-    Cu["import"]("resource:///modules/devtools/dbg-client.jsm");
+    Cu["import"]("resource://gre/modules/devtools/dbg-client.jsm");
 }
 catch (err)
 {
diff --git a/content/httpmonitor/remote/protocol.js b/content/httpmonitor/remote/protocol.js
index d02a499..2be4f39 100644
--- a/content/httpmonitor/remote/protocol.js
+++ b/content/httpmonitor/remote/protocol.js
@@ -95,11 +95,6 @@ Protocol.prototype =
         return this.currentTab ? this.currentTab.actor : null;
     },
 
-    getNetActor: function(tabActor, callback)
-    {
-        this.connection.sendPacket(tabActor, "networkMonitorActor", true, callback);
-    },
-
     subscribe: function(netActor, callback)
     {
         if (this.currentNetActor)
@@ -139,13 +134,10 @@ Protocol.prototype =
 
         // A tab has been selected so, subscribe to the Net monitor actor. The callback
         // will receive events about any HTTP traffic within the target tab.
-        this.getNetActor(tabActor.id, function(packet)
-        {
-            self.subscribe(packet.actor, netEvent);
+        self.subscribe(tabActor.networkMonitorActor, netEvent);
 
-            // Also register callback for 'tabNavigated' events.
-            self.connection.addCallback(tabActor.id, tabNavigated, false);
-        });
+        // Also register callback for 'tabNavigated' events.
+        self.connection.addCallback(tabActor.id, tabNavigated, false);
     },
 
     onTabUnselected: function(tabActor)
diff --git a/content/httpmonitor/remote/remoteProxy.js b/content/httpmonitor/remote/remoteProxy.js
index 34b31e9..5968c7a 100644
--- a/content/httpmonitor/remote/remoteProxy.js
+++ b/content/httpmonitor/remote/remoteProxy.js
@@ -25,9 +25,11 @@ RemoteProxy.prototype = Obj.extend(Proxy,
         if (FBTrace.DBG_REMOTENETMONITOR)
             FBTrace.sysout("remotenet; RemoteProxy.getTabs()");
 
+        var self = this;
         this.protocol.getTabList(function(packet)
         {
             var result = [];
+            self.protocol.traceActor = packet.traceActor;
             var tabs = packet.tabs;
             for (var i=0; i<tabs.length; ++i)
             {
@@ -35,9 +37,9 @@ RemoteProxy.prototype = Obj.extend(Proxy,
                 result.push({
                     id: tab.actor,
                     label: tab.title ? tab.title : tab.url,
+                    networkMonitorActor: tab.networkMonitorActor
                 })
             }
-
             callback(result);
         });
     },
diff --git a/content/httpmonitor/server/httpServer.js b/content/httpmonitor/server/httpServer.js
index a8c6bd8..774e21b 100644
--- a/content/httpmonitor/server/httpServer.js
+++ b/content/httpmonitor/server/httpServer.js
@@ -37,39 +37,30 @@ var HttpServer =
         TabCacheModel.initialize();
         TabCacheModel.initializeUI();
 
+        // TODO: this initialization is happening way too soon. The server
+        // should be started when the user launches the tool from the UI.
         try
         {
-            Components.utils.import("resource:///modules/devtools/dbg-server.jsm");
+            Components.utils.import("resource://gre/modules/devtools/dbg-server.jsm");
 
             // RemoteDebugger object should exist on Fennec so, use it if the server
             // is running on Fennec
             // https://bugzilla.mozilla.org/show_bug.cgi?id=739966
             if (typeof(RemoteDebugger) != "undefined")
             {
-                RemoteDebugger._start();
+                RemoteDebugger.init();
             }
             // Otherwise initialize the browser debugger.
-            else if (!DebuggerServer.initialized)
+            else
             {
-                // Initialize the server (e.g. appends script debugger actors)
-                DebuggerServer.init();
-
-                try
-                {
-                    // Only available on Fennec
-                    DebuggerServer.addActors("chrome://browser/content/dbg-browser-actors.js");
-                }
-                catch (err)
+                if (!DebuggerServer.initialized)
                 {
-                    // This should happen for Firefox
+                    // Initialize the server (e.g. appends script debugger actors)
+                    DebuggerServer.init();
                     DebuggerServer.addBrowserActors();
                 }
-
                 // Open a TCP listener
-                // xxxHonza: what about a pref for the port number and true/false for
-                // loopback device? What if the script debugger already opened that
-                // listener?
-                DebuggerServer.openListener(2929, false);
+                DebuggerServer.openListener(Services.prefs.getIntPref("devtools.debugger.remote-port"));
             }
         }
         catch (ex)
@@ -82,7 +73,6 @@ var HttpServer =
     {
         FBTrace.sysout("HttpServer; shutdown");
 
-        // xxxHonza: what if there are other tools sharing the connection?
         DebuggerServer.closeListener();
     },
 }
diff --git a/content/httpmonitor/server/netMonitorActor.js b/content/httpmonitor/server/netMonitorActor.js
index c03a2a6..a087e6e 100644
--- a/content/httpmonitor/server/netMonitorActor.js
+++ b/content/httpmonitor/server/netMonitorActor.js
@@ -211,30 +211,7 @@ NetworkMonitorActor.prototype.requestTypes =
     "sendRequest": NetworkMonitorActor.prototype.onSendRequest,
 };
 
-// ********************************************************************************************* //
-// Network Monitor Actor Handler
-
-function networkMonitorActorHandler(tab, request)
-{
-    // Reuse a previously-created actor, if any.
-    if (tab.networkMonitorActor)
-        return tab.networkMonitorActor.grip();
-
-    var actor = new NetworkMonitorActor(tab);
-    tab.networkMonitorActor = actor;
-
-    // xxxHonza: this needs to be reviewed by Panos
-    // If it's added into the tabActorPool, disconnect is not executed for the actor.
-    //tab.tabActorPool.addActor(actor);
-    tab.conn.addActor(actor);
-
-    if (FBTrace.DBG_NETACTOR)
-        FBTrace.sysout("networkMonitorActorHandler ", {tab: tab, request: request});
-
-    return actor.grip();
-}
-
-DebuggerServer.addTabRequest("networkMonitorActor", networkMonitorActorHandler);
+DebuggerServer.addTabActor(NetworkMonitorActor, "networkMonitorActor");
 
 // ********************************************************************************************* //
 });
diff --git a/content/httpmonitor/server/traceActor.js b/content/httpmonitor/server/traceActor.js
index 0ed46ec..fec8007 100644
--- a/content/httpmonitor/server/traceActor.js
+++ b/content/httpmonitor/server/traceActor.js
@@ -124,33 +124,7 @@ TraceActor.prototype.requestTypes =
     "detach": TraceActor.prototype.onDetach,
 };
 
-// ********************************************************************************************* //
-// Trace Actor Handler
-
-function traceActorHandler(rootActor, request)
-{
-    // Reuse a previously-created actor, if any.
-    if (rootActor.traceActor)
-        return rootActor.traceActor.grip();
-
-    var actor = new TraceActor(rootActor);
-    rootActor.traceActor = actor;
-    rootActor.conn.addActor(actor);
-
-    return actor.grip();
-}
-
-// xxxHonza: I believe this should be part of dbg-browser-actor.js
-if (typeof(DebuggerServer.addRequest) == "undefined")
-{
-    DebuggerServer.addRequest = function DS_addRequest(aName, aFunction) {
-      DebuggerServer.BrowserRootActor.prototype.requestTypes[aName] = function(aRequest) {
-        return aFunction(this, aRequest);
-      }
-    };
-}
-
-DebuggerServer.addRequest("traceActor", traceActorHandler);
+DebuggerServer.addGlobalActor(TraceActor, "traceActor");
 
 // ********************************************************************************************* //
 });