diff --git a/devops-client/bin/devops b/devops-client/bin/devops
index 92f45ad..d8dfac0 100755
--- a/devops-client/bin/devops
+++ b/devops-client/bin/devops
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'devops-client'
+require 'bundler'
+Bundler.require(:default, :development)
 
 DevopsClient.run
diff --git a/devops-service/db/mongo/connectors/server.rb b/devops-service/db/mongo/connectors/server.rb
index 4e010fa..78e0798 100644
--- a/devops-service/db/mongo/connectors/server.rb
+++ b/devops-service/db/mongo/connectors/server.rb
@@ -8,7 +8,7 @@ module Connectors
       self.collection = db.collection('servers')
     end
 
-    def servers_find(query, fields)
+    def servers_find(query, fields=nil)
       query_options = fields.nil? ? {} : {fields: fields}
       list(query, query_options)
     end