diff --git a/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_COORDINATOR_115200.bin b/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_COORDINATOR_115200.bin
new file mode 100644
index 0000000..8d74b83
Binary files /dev/null and b/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_COORDINATOR_115200.bin differ
diff --git a/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_FULL_FUNC_DEVICE_115200.bin b/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_FULL_FUNC_DEVICE_115200.bin
new file mode 100644
index 0000000..8d74b83
Binary files /dev/null and b/firmware/ZigbeeNodeControlBridge_JN5168_GP_Proxy_FULL_FUNC_DEVICE_115200.bin differ
diff --git a/libqtzigbee/interface/zigbeeinterface.cpp b/libqtzigbee/interface/zigbeeinterface.cpp
index bd2d400..40a46ae 100644
--- a/libqtzigbee/interface/zigbeeinterface.cpp
+++ b/libqtzigbee/interface/zigbeeinterface.cpp
@@ -150,8 +150,6 @@ void ZigbeeInterface::onReadyRead()
             case WaitForData:
                 m_data.append(static_cast<char>(byte));
                 break;
-            default:
-                break;
             }
 
             break;
@@ -174,7 +172,6 @@ bool ZigbeeInterface::enable(const QString &serialPort, qint32 baudrate)
     }
 
     m_serialPort = new QSerialPort(serialPort, this);
-    //m_serialPort->setBaudRate(QSerialPort::Baud115200);
     m_serialPort->setBaudRate(baudrate);
     m_serialPort->setDataBits(QSerialPort::Data8);
     m_serialPort->setParity(QSerialPort::NoParity);
@@ -184,7 +181,7 @@ bool ZigbeeInterface::enable(const QString &serialPort, qint32 baudrate)
     connect(m_serialPort, SIGNAL(error(QSerialPort::SerialPortError)), this, SLOT(onError(QSerialPort::SerialPortError)));
 
     if (!m_serialPort->open(QSerialPort::ReadWrite)) {
-        qCWarning(dcZigbeeInterface()) << "Could not open serial port" << serialPort;
+        qCWarning(dcZigbeeInterface()) << "Could not open serial port" << serialPort << baudrate;
         delete m_serialPort;
         m_serialPort = nullptr;
         return false;
diff --git a/libqtzigbee/zigbeenetworkmanager.cpp b/libqtzigbee/zigbeenetworkmanager.cpp
index 4382c0a..e2dc14b 100644
--- a/libqtzigbee/zigbeenetworkmanager.cpp
+++ b/libqtzigbee/zigbeenetworkmanager.cpp
@@ -20,6 +20,7 @@ ZigbeeNetworkManager::ZigbeeNetworkManager(const int &channel, const QString &se
     }
 
     QSettings settings;
+    qCDebug(dcZigbee()) << "Loading settings from" << settings.fileName();
     settings.beginGroup("Network");
     m_extendedPanId = static_cast<quint64>(settings.value("panId", 0).toLongLong());
     qCDebug(dcZigbee()) << "Loading saved pan id" << m_extendedPanId;
@@ -156,7 +157,7 @@ void ZigbeeNetworkManager::resetController()
 {
     ZigbeeInterfaceRequest request(ZigbeeInterfaceMessage(Zigbee::MessageTypeReset));
     request.setDescription("Reset controller");
-    request.setTimoutIntervall(3000);
+    request.setTimoutIntervall(5000);
 
     ZigbeeInterfaceReply *reply = controller()->sendRequest(request);
     connect(reply, &ZigbeeInterfaceReply::finished, this, &ZigbeeNetworkManager::onResetControllerFinished);
diff --git a/zigbee-cli/core.cpp b/zigbee-cli/core.cpp
index 6f86253..59676be 100644
--- a/zigbee-cli/core.cpp
+++ b/zigbee-cli/core.cpp
@@ -96,7 +96,7 @@ void Core::onCommandReceived(const QStringList &tokens)
         m_manager->setDeviceType(nodeType);
         // Note: this is the leaked philips ZLL master key
         m_manager->setInitialSecurity(3, 0, 1, "9F5595F10257C8A469CBF42BC93FEE31");
-        m_manager->setInitialSecurity(4, 0, 1, "5A6967426565416C6C69616E63653039");
+        //m_manager->setInitialSecurity(4, 0, 1, "5A6967426565416C6C69616E63653039");
 
     } else if (command.command() == "start") {
         m_manager->startNetwork();
@@ -109,7 +109,7 @@ void Core::onCommandReceived(const QStringList &tokens)
     } else if (command.command() == "reset") {
         m_manager->resetController();
     } else if (command.command() == "permit-join") {
-        m_manager->permitJoining(0xfffc, 180, true);
+        m_manager->permitJoining(0x0000, 180, true);
     } else if (command.command() == "touch-link") {
         m_manager->initiateTouchLink();
     } else if (command.command() == "reset-touchlink") {