diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributes.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributes.java
index 8628d0c16c..2cfeefb19e 100644
--- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributes.java
+++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributes.java
@@ -91,4 +91,13 @@ public class DeviceAttributes {
         }
         return map;
     }
+
+    @Override
+    public String toString() {
+        return "DeviceAttributes{" +
+                "clientSideAttributesMap=" + clientSideAttributesMap +
+                ", serverPrivateAttributesMap=" + serverPrivateAttributesMap +
+                ", serverPublicAttributesMap=" + serverPublicAttributesMap +
+                '}';
+    }
 }
diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java
index 9360af17ac..12958f5a3e 100644
--- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java
+++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.extensions.core.action.template;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.runtime.parser.ParseException;
@@ -35,6 +36,7 @@ import java.util.Optional;
 /**
  * @author Andrew Shvayka
  */
+@Slf4j
 public abstract class AbstractTemplatePluginAction<T extends TemplateActionConfiguration> extends SimpleRuleLifecycleComponent implements PluginAction<T> {
     protected T configuration;
     protected Template template;
@@ -69,6 +71,7 @@ public abstract class AbstractTemplatePluginAction<T extends TemplateActionConfi
     }
 
     protected String getMsgBody(RuleContext ctx, ToDeviceActorMsg msg) {
+        log.trace("Creating context for: {} and payload {}", ctx.getDeviceAttributes(), msg.getPayload());
         VelocityContext context = VelocityUtils.createContext(ctx.getDeviceAttributes(), msg.getPayload());
         return VelocityUtils.merge(template, context);
     }
diff --git a/extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java b/extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java
index bde0a6f549..87f890a627 100644
--- a/extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java
+++ b/extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.extensions.kafka.plugin;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.thingsboard.server.common.data.id.RuleId;
@@ -30,6 +31,7 @@ import org.thingsboard.server.extensions.kafka.action.KafkaActionMsg;
 import org.thingsboard.server.extensions.kafka.action.KafkaActionPayload;
 
 @RequiredArgsConstructor
+@Slf4j
 public class KafkaMsgHandler implements RuleMsgHandler {
 
     private final Producer<?, String> producer;
@@ -40,7 +42,7 @@ public class KafkaMsgHandler implements RuleMsgHandler {
             throw new RuleException("Unsupported message type " + msg.getClass().getName() + "!");
         }
         KafkaActionPayload payload = ((KafkaActionMsg) msg).getPayload();
-
+        log.debug("Processing kafka payload: {}", payload);
         try {
             producer.send(new ProducerRecord<>(payload.getTopic(), payload.getMsgBody()),
                     (metadata, e) -> {
diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java
index a78319afd9..d6a953a1f9 100644
--- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java
+++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java
@@ -78,6 +78,7 @@ public class GatewaySessionCtx {
                 Device newDevice = new Device();
                 newDevice.setTenantId(gateway.getTenantId());
                 newDevice.setName(deviceName);
+                newDevice.setType("default");
                 return deviceService.saveDevice(newDevice);
             });
             GatewayDeviceSessionCtx ctx = new GatewayDeviceSessionCtx(this, device);