diff --git a/package.json b/package.json
index 0a926e83298..f105c9d72d8 100644
--- a/package.json
+++ b/package.json
@@ -121,8 +121,8 @@
     "marked": "^0.3.5",
     "moment": "^2.10.6",
     "mongodb-collection-model": "^0.2.3",
-    "mongodb-connection-model": "^4.3.0",
-    "mongodb-data-service": "^0.3.0",
+    "mongodb-connection-model": "^5.0.0",
+    "mongodb-data-service": "^1.0.0",
     "mongodb-database-model": "^0.1.2",
     "mongodb-explain-plan-model": "^0.2.0",
     "mongodb-extended-json": "^1.6.0",
diff --git a/src/app/connect/connect-form-view.js b/src/app/connect/connect-form-view.js
index 4fd35de936a..02a2b805253 100644
--- a/src/app/connect/connect-form-view.js
+++ b/src/app/connect/connect-form-view.js
@@ -68,9 +68,7 @@ var ConnectFormView = FormView.extend({
     // fill in all default fields
     obj.hostname = obj.hostname.toLowerCase() || 'localhost';
     obj.port = parseInt(obj.port || 27017, 10);
-    if (obj.ssh_tunnel_port) {
-      obj.ssh_tunnel_port = parseInt(obj.ssh_tunnel_port, 10);
-    }
+    obj.ssh_tunnel_port = parseInt(obj.ssh_tunnel_port || 22, 10);
 
     // make a friendly connection name
     // this.makeFriendlyName(obj);
diff --git a/src/app/index.js b/src/app/index.js
index afbbe1154de..81e1f0b513d 100644
--- a/src/app/index.js
+++ b/src/app/index.js
@@ -398,8 +398,8 @@ app.extend({
 
       var DataService = require('mongodb-data-service');
       app.dataService = new DataService(state.connection)
-        .on(DataService.Events.Readable, state.onClientReady.bind(state))
-        .on(DataService.Events.Error, state.onFatalError.bind(state, 'create client'));
+        .on('readable', state.onClientReady.bind(state))
+        .on('error', state.onFatalError.bind(state, 'create client'));
 
       app.dataService.connect(function() {
         ApplicationStore.dataService = app.dataService;