diff --git a/broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java b/broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java
index 3dd8d5dd..1065ce1b 100644
--- a/broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java
+++ b/broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java
@@ -17,11 +17,13 @@ package io.moquette.server.netty;
 
 import com.bugsnag.Bugsnag;
 import io.moquette.server.config.IConfig;
+import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 
 import static io.moquette.BrokerConstants.BUGSNAG_TOKEN_PROPERTY_NAME;
 
+@Sharable
 public class BugSnagErrorsHandler extends ChannelInboundHandlerAdapter {
 
     private Bugsnag bugsnag;
diff --git a/broker/src/test/resources/log4j.properties b/broker/src/test/resources/log4j.properties
index f1b2907a..ea5a247a 100644
--- a/broker/src/test/resources/log4j.properties
+++ b/broker/src/test/resources/log4j.properties
@@ -23,7 +23,7 @@ log4j.appender.stdout.Threshold=INFO
 # for debug trace
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 #log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n
-log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c{1} %M %L %x - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{dd/MM/yyyy HH:mm:ss,SSS} [%t] %-5p %c{1} %M %L %x - %m%n
 
 #file appender
 log4j.appender.file=org.apache.log4j.RollingFileAppender
diff --git a/distribution/src/main/resources/log4j.properties b/distribution/src/main/resources/log4j.properties
index 61764438..8e47755e 100644
--- a/distribution/src/main/resources/log4j.properties
+++ b/distribution/src/main/resources/log4j.properties
@@ -42,6 +42,6 @@ log4j.appender.messagelog.File=moquette_messages.log
 log4j.appender.messagelog.MaxFileSize=100MB
 log4j.appender.messagelog.MaxBackupIndex=1
 log4j.appender.messagelog.layout=org.apache.log4j.PatternLayout
-log4j.appender.messagelog.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c{1} %L %x - %m%n
+log4j.appender.messagelog.layout.ConversionPattern=%d{dd/MM/yyyy HH:mm:ss,SSS} [%t] %-5p %c{1} %L %x - %m%n
 
 log4j.category.messageLogger=WARN, messagelog