diff --git a/lib/fiware-pep-steelskin.js b/lib/fiware-pep-steelskin.js
index 86d25ee..6be28ed 100644
--- a/lib/fiware-pep-steelskin.js
+++ b/lib/fiware-pep-steelskin.js
@@ -197,7 +197,7 @@ function createDynamicMiddlewareExecutor(proxyObj) {
  * @param {Function} next        Call to the next error handler in the chain.
  */
 function traceRequest(req, res, next) {
-    const logger = req.logger
+    const logger = req.logger;
     logger.debug('Request for path [%s] from [%s]', req.path, req.get('host'));
     logger.debug('Headers:\n%j\n', req.headers);
 
diff --git a/lib/middleware/logging.js b/lib/middleware/logging.js
index 1e64c61..75c35df 100644
--- a/lib/middleware/logging.js
+++ b/lib/middleware/logging.js
@@ -60,10 +60,10 @@ function requestLogger(componentName) {
         let contextCorr  = req.get(constants.CORRELATOR_HEADER);
         if (!contextCorr) {
             contextCorr = contextTrans;
-            req.corr = contextCorr; // for propagate in FWD request
         }
+        req.corr = contextCorr; // for propagate in FWD request
         res.set(constants.CORRELATOR_HEADER, contextCorr); // for response
-        const contextStart = Date.now()
+        const contextStart = Date.now();
         req.logger = logger.child({
             corr: contextCorr,
             trans: contextTrans,
@@ -72,13 +72,13 @@ function requestLogger(componentName) {
             srv: contextSrv,
             subsrv: contextSubsrv,
             comp: componentName
-        })
+        });
         res.once('finish', function() {
             const responseTime = Date.now() - contextStart;
             req.logger.debug('response-time: ' + responseTime + ' statusCode: ' + res.statusCode);
         });
         next();
-    }
+    };
 }
 
 exports.requestLogger = requestLogger;
diff --git a/lib/plugins/orionPlugin.js b/lib/plugins/orionPlugin.js
index 38a39f3..1ec0afd 100644
--- a/lib/plugins/orionPlugin.js
+++ b/lib/plugins/orionPlugin.js
@@ -171,7 +171,7 @@ function inspectBodyJSON(logger, body, field, callback) {
  * @param {Object} res           Outgoing response.
  */
 function inspectBodyV1(req, res, callback) {
-    const logger = req.logger
+    const logger = req.logger;
     var actionHandler = function actionHandler(error, action) {
         req.action = action;
         callback(error, req, res);
@@ -192,7 +192,7 @@ function inspectBodyV1(req, res, callback) {
 }
 
 function inspectBodyV2(req, res, callback) {
-    const logger = req.logger
+    const logger = req.logger;
     var actionHandler = function actionHandler(error, action) {
         req.action = action;
         callback(error, req, res);
diff --git a/lib/services/cacheUtils.js b/lib/services/cacheUtils.js
index c19ea2c..752c8bd 100644
--- a/lib/services/cacheUtils.js
+++ b/lib/services/cacheUtils.js
@@ -24,7 +24,6 @@
 'use strict';
 
 var config = require('../../config'),
-    domainModule = require('domain'),
     logger = require('logops'),
     NodeCache = require('node-cache'),
     EventEmitter = require('events').EventEmitter,
diff --git a/lib/services/keystoneAuth.js b/lib/services/keystoneAuth.js
index e633967..a695d67 100644
--- a/lib/services/keystoneAuth.js
+++ b/lib/services/keystoneAuth.js
@@ -30,7 +30,6 @@ var request = require('request'),
     apply = async.apply,
     constants = require('../constants'),
     EventEmitter = require('events').EventEmitter,
-    domainModule = require('domain'),
     waitingRequests = new EventEmitter(),
     cacheUtils = require('./cacheUtils'),
     authenticating = false,
diff --git a/test/unit/simultaneous_requests-test.js b/test/unit/simultaneous_requests-test.js
index 02fe858..9bfdb55 100644
--- a/test/unit/simultaneous_requests-test.js
+++ b/test/unit/simultaneous_requests-test.js
@@ -23,8 +23,7 @@
 
 'use strict';
 
-var domain = require('domain'),
-    serverMocks = require('../tools/serverMocks'),
+var serverMocks = require('../tools/serverMocks'),
     proxyLib = require('../../lib/fiware-pep-steelskin'),
     orionPlugin = require('../../lib/plugins/orionPlugin'),
     cacheUtils = require('../../lib/services/cacheUtils'),
@@ -64,7 +63,7 @@ describe('Simultaneous requests', function() {
 
         proxyLib.start(function(error, proxyObj) {
             var testExtraction = function(req, res, callback) {
-                correlatorIds.push(domain.active.corr);
+                correlatorIds.push(req.corr);
                 callback(null, req, res);
             };
 
@@ -119,7 +118,7 @@ describe('Simultaneous requests', function() {
 
             sendRequestBackup = proxyPlugin.sendRequest;
             proxyPlugin.sendRequest = function(req, res, next) {
-                correlatorIdsPost.push(domain.active.corr);
+                correlatorIdsPost.push(req.corr);
                 sendRequestBackup(req, res, next);
             };
 
@@ -191,7 +190,7 @@ describe('Simultaneous requests', function() {
 
             sendRequestBackup = proxyPlugin.sendRequest;
             proxyPlugin.sendRequest = function(req, res, next) {
-                correlatorIdsPost.push(domain.active.corr);
+                correlatorIdsPost.push(req.corr);
                 sendRequestBackup(req, res, next);
             };