diff --git a/packages/composer-common/lib/connectionprofilemanager.js b/packages/composer-common/lib/connectionprofilemanager.js
index 87dfce6fc9..ab45dc7bbf 100644
--- a/packages/composer-common/lib/connectionprofilemanager.js
+++ b/packages/composer-common/lib/connectionprofilemanager.js
@@ -120,7 +120,7 @@ class ConnectionProfileManager {
                                 connectionManager = new(curmod.require(mod))(this);
                                 break;
                             } catch (e) {
-                                LOG.error(METHOD,'No yet located the module ',e.message);
+                                LOG.info(METHOD,'No yet located the module ',e.message);
                                 // Continue to search the parent.
                             }
                             curmod = curmod.parent;
@@ -134,7 +134,7 @@ class ConnectionProfileManager {
                                     return true;
                                 } catch (e) {
                                     // Search the next one.
-                                    LOG.debug(METHOD,e);
+                                    LOG.info(METHOD,e);
                                     return false;
                                 }
                             });
diff --git a/packages/composer-common/lib/log/logger.js b/packages/composer-common/lib/log/logger.js
index fb0614e8ae..7794bef57f 100644
--- a/packages/composer-common/lib/log/logger.js
+++ b/packages/composer-common/lib/log/logger.js
@@ -323,9 +323,9 @@ class Logger {
                 },
                 'file': {
 
-                    'filename': 'trace_PID.log',
-                    'enabledLevel': 'silly',
-                    'alwaysLevel': 'info'
+                    'filename': 'trace_TIMESTAMP.log',
+                    'enabledLevel': 'debug',
+                    'alwaysLevel': 'error'
                 }
             }};
 
diff --git a/packages/composer-common/lib/log/winstonInjector.js b/packages/composer-common/lib/log/winstonInjector.js
index 11d2a7bab5..9f3bab0074 100644
--- a/packages/composer-common/lib/log/winstonInjector.js
+++ b/packages/composer-common/lib/log/winstonInjector.js
@@ -61,7 +61,13 @@ exports.getLogger = function (config,configElements){
 
     // process the file name and make sure the directory has been created
     let resolvedFilename = config.file.filename.replace(/PID/g, process.pid);
-    let dir = './logs';
+
+    // process the filename and get the timestampe replaced
+    let d = new Date();
+    let timestamp = sprintf('%d%02d%02d-%02d%02d%02d-%03d',d.getUTCFullYear(),d.getUTCMonth()+1,d.getUTCDate()+1,d.getHours(),d.getMinutes(),d.getSeconds(),d.getMilliseconds());
+    resolvedFilename = resolvedFilename.replace(/TIMESTAMP/g, timestamp);
+
+    let dir = './composer-logs';
     fs.ensureDirSync(dir);
 
     // create the Winston logger with the two transports.
diff --git a/packages/composer-connector-hlfv1/lib/hlfconnection.js b/packages/composer-connector-hlfv1/lib/hlfconnection.js
index c4c51f579e..e8f3326ede 100644
--- a/packages/composer-connector-hlfv1/lib/hlfconnection.js
+++ b/packages/composer-connector-hlfv1/lib/hlfconnection.js
@@ -342,6 +342,7 @@ class HLFConnection extends Connection {
             })
             .then(() => {
                 let txId = this.client.newTransactionID();
+
                 // This is evil! I shouldn't need to set GOPATH in a node.js program.
                 process.env.GOPATH = tempDirectoryPath;
 
@@ -739,7 +740,6 @@ class HLFConnection extends Connection {
 
         let txId = this.client.newTransactionID();
 
-
         // Submit the query request.
         const request = {
             chaincodeId: this.businessNetworkIdentifier,