diff --git a/libnymea-zigbee/zigbeechannelmask.cpp b/libnymea-zigbee/zigbeechannelmask.cpp
index a70f0d4..2e4e73d 100644
--- a/libnymea-zigbee/zigbeechannelmask.cpp
+++ b/libnymea-zigbee/zigbeechannelmask.cpp
@@ -33,6 +33,11 @@ ZigbeeChannelMask::ZigbeeChannelMask()
 
 }
 
+ZigbeeChannelMask::ZigbeeChannelMask(const ZigbeeChannelMask &other)
+{
+    m_channelMask = other.toUInt32();
+}
+
 ZigbeeChannelMask::ZigbeeChannelMask(quint32 channelMask) :
     m_channelMask(channelMask)
 {
diff --git a/libnymea-zigbee/zigbeechannelmask.h b/libnymea-zigbee/zigbeechannelmask.h
index c5d804c..3a33d47 100644
--- a/libnymea-zigbee/zigbeechannelmask.h
+++ b/libnymea-zigbee/zigbeechannelmask.h
@@ -46,6 +46,7 @@ public:
     Q_ENUM(ChannelConfiguration)
 
     ZigbeeChannelMask();
+    ZigbeeChannelMask(const ZigbeeChannelMask &other);
     ZigbeeChannelMask(quint32 channelMask);
     ZigbeeChannelMask(Zigbee::ZigbeeChannels channels);
 
diff --git a/libnymea-zigbee/zigbeedatatype.cpp b/libnymea-zigbee/zigbeedatatype.cpp
index 0cc6219..9e23e81 100644
--- a/libnymea-zigbee/zigbeedatatype.cpp
+++ b/libnymea-zigbee/zigbeedatatype.cpp
@@ -36,6 +36,12 @@ ZigbeeDataType::ZigbeeDataType()
     setDataType(Zigbee::NoData);
 }
 
+ZigbeeDataType::ZigbeeDataType(const ZigbeeDataType &other)
+{
+    setDataType(other.dataType());
+    m_data = other.data();
+}
+
 ZigbeeDataType::ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data):
     m_data(data)
 {
diff --git a/libnymea-zigbee/zigbeedatatype.h b/libnymea-zigbee/zigbeedatatype.h
index b62ce83..b312916 100644
--- a/libnymea-zigbee/zigbeedatatype.h
+++ b/libnymea-zigbee/zigbeedatatype.h
@@ -35,6 +35,7 @@ class ZigbeeDataType
 {
 public:
     ZigbeeDataType();
+    ZigbeeDataType(const ZigbeeDataType &other);
     ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data = QByteArray());
 
     // From uint
diff --git a/libnymea-zigbee/zigbeenode.h b/libnymea-zigbee/zigbeenode.h
index eb4908c..c2971db 100644
--- a/libnymea-zigbee/zigbeenode.h
+++ b/libnymea-zigbee/zigbeenode.h
@@ -126,7 +126,7 @@ public:
     } ServerMask;
 
     typedef struct NodeDescriptor {
-        NodeType nodeType = NodeTypeRouter;
+        NodeType nodeType = NodeTypeEndDevice;
         bool complexDescriptorAvailable = false;
         bool userDescriptorAvailable = false;
         FrequencyBand frequencyBand = FrequencyBand2400Mhz;
@@ -288,7 +288,6 @@ private:
     void readModelIdentifier(ZigbeeClusterBasic *basicCluster);
     void readSoftwareBuildId(ZigbeeClusterBasic *basicCluster);
 
-
 signals:
     void stateChanged(State state);
     void connectedChanged(bool connected);