diff --git a/packages/livedata/livedata_connection.js b/packages/livedata/livedata_connection.js
index fba5ad6541..6bdded8d8d 100644
--- a/packages/livedata/livedata_connection.js
+++ b/packages/livedata/livedata_connection.js
@@ -1536,7 +1536,7 @@ LivedataTest.Connection = Connection;
 DDP.connect = function (url, options) {
   var ret = new Connection(url, options);
   allConnections.push(ret); // hack. see below.
-
+  debugger;
   return ret;
 };
 
diff --git a/tools/bundler.js b/tools/bundler.js
index 937b3fabd2..17e10ec436 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1777,9 +1777,9 @@ exports.bundle = function (options) {
       // Server
       var browserClient = targets["client.browser"];
       if (browserClient) {
-        var server = makeServerTarget(app, browserClient);
-        var server = options.cachedServerTarget || makeServerTarget(app, client);
-        server.clientTarget = client;
+        var server = options.cachedServerTarget ||
+                     makeServerTarget(app, browserClient);
+        server.clientTarget = browserClient;
         targets.server = server;
       }
     }
diff --git a/tools/client/cordova-boilerplate.html b/tools/client/cordova-boilerplate.html
index 4a5d3239db..4d0bfb5e02 100644
--- a/tools/client/cordova-boilerplate.html
+++ b/tools/client/cordova-boilerplate.html
@@ -9,8 +9,8 @@
 
 <script type="text/javascript">
   __meteor_runtime_config__ = {
-    'meteorRelease':'0.8.2',
-    'ROOT_URL':'http://localhost:3000',
+    'meteorRelease':'none',
+    'ROOT_URL':'http://localhost:3000/',
     'ROOT_URL_PATH_PREFIX':'',
     'DDP_DEFAULT_CONNECTION_URL':'http://localhost:3000'
   };
@@ -21,7 +21,6 @@
 
 {{{head}}}
 <script type="text/javascript">
-  Meteor.disconnect();
   UI.body.INSTANTIATED = true;
 
   if (typeof Package === 'undefined' ||