diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js
index cfc96a8855583d4854515e3859fd25e3f33bd88e..47d48c9ecd0589cf2d49e935f23236794c8d062b 100644
--- a/www/js/controllers/network-controllers.js
+++ b/www/js/controllers/network-controllers.js
@@ -624,13 +624,12 @@ function PeerViewController($scope, $q, $window, $state, UIUtils, csWot, BMA) {
         })
         .catch(function(err){
           console.error(err && err.message || err);
-        })
-      ,
+        }),
 
       // Get known peers
       $scope.node.network.peers()
         .then(function(json) {
-          var peers = json.peers.map(function (p) {
+          var peers = (json && json.peers || []).map(function (p) {
             var peer = new Peer(p);
             peer.online = p.status === 'UP';
             peer.buid = peer.block;
diff --git a/www/js/services/currency-services.js b/www/js/services/currency-services.js
index cc15c16cd115dbe537bfde043d0bc48324e95618..92c0c3e1d14bac93ba4cdabb44613101fab08dd3 100644
--- a/www/js/services/currency-services.js
+++ b/www/js/services/currency-services.js
@@ -4,7 +4,12 @@ angular.module('cesium.currency.services', ['ngApi', 'cesium.bma.services'])
 .factory('csCurrency', function($rootScope, $q, $timeout, BMA, Api, csSettings) {
   'ngInject';
 
-  function factory(id, BMA) {
+  var defaultBMA = BMA;
+
+  function CsCurrency(id, BMA) {
+
+    BMA = BMA || defaultBMA;
+
     var
       constants = {
         // Avoid to many call on well known currencies
@@ -348,7 +353,9 @@ angular.module('cesium.currency.services', ['ngApi', 'cesium.bma.services'])
     };
   }
 
-  var service = factory('default', BMA);
-  service.instance = factory;
+  var service = new CsCurrency('default');
+  service.instance = function(id, bma) {
+    return new CsCurrency(id, bma);
+  };
   return service;
 });
diff --git a/www/js/services/network-services.js b/www/js/services/network-services.js
index 00c5945e0f397dbbbd4de4dd113e32c28470f714..dbf0b26c991cb7b5773e61c642af6986edaf4dd9 100644
--- a/www/js/services/network-services.js
+++ b/www/js/services/network-services.js
@@ -4,7 +4,7 @@ angular.module('cesium.network.services', ['ngApi', 'cesium.currency.services',
 .factory('csNetwork', function($rootScope, $q, $interval, $timeout, $window, csConfig, BMA, csHttp, csCurrency, Api) {
   'ngInject';
 
-  function csNetwork(id) {
+  function CsNetwork(id) {
 
     var
       interval,
@@ -843,12 +843,12 @@ angular.module('cesium.network.services', ['ngApi', 'cesium.currency.services',
       // api extension
       api: api
     };
-  };
+  }
 
-  var service = csNetwork('default');
+  var service = new CsNetwork('default');
 
   service.instance = function(id) {
-    return new csNetwork(id);
+    return new CsNetwork(id);
   };
 
   return service;
diff --git a/www/js/services/tx-services.js b/www/js/services/tx-services.js
index 6f3306f900cf971d865b5e1861d3af95e47d142f..2647b9e5679ec9c134fc0aeb846ed3935f4cbf25 100644
--- a/www/js/services/tx-services.js
+++ b/www/js/services/tx-services.js
@@ -8,7 +8,7 @@ angular.module('cesium.tx.services', ['ngApi', 'cesium.bma.services',
 
   var defaultBMA = BMA;
 
-  function factory(id, BMA) {
+  function CsTx(id, BMA) {
 
     BMA = BMA || defaultBMA;
     var
@@ -454,8 +454,10 @@ angular.module('cesium.tx.services', ['ngApi', 'cesium.bma.services',
     };
   }
 
-  var service = factory('default', BMA);
+  var service = new CsTx('default');
 
-  service.instance = factory;
+  service.instance = function(id, bma) {
+    return new CsTx(id, bma);
+  };
   return service;
 });
diff --git a/www/plugins/es/js/services/http-services.js b/www/plugins/es/js/services/http-services.js
index 8bdd9b6b3578bdddec9f03e7faa07446f890396a..9b0990a28a55a056edbe52493711513bcd939ce6 100644
--- a/www/plugins/es/js/services/http-services.js
+++ b/www/plugins/es/js/services/http-services.js
@@ -678,7 +678,7 @@ angular.module('cesium.es.http.services', ['ngResource', 'ngApi', 'cesium.servic
   var service = new EsHttp();
 
   service.instance = function(host, port, useSsl) {
-    return new EsHttp(host, port, useSsl)
+    return new EsHttp(host, port, useSsl);
   };
 
   return service;