diff --git a/connections/connectionwindow.cpp b/connections/connectionwindow.cpp
index 3a5fabf..e63e72a 100644
--- a/connections/connectionwindow.cpp
+++ b/connections/connectionwindow.cpp
@@ -70,7 +70,7 @@ ConnectionWindow::ConnectionWindow(QWidget *parent) :
     rxBroadcast = new QUdpSocket(this);
     //Need to make sure it tries to share the address in case there are
     //multiple instances of SavvyCAN running.
-    rxBroadcast->bind(QHostAddress::AnyIPv4, 17222, QAbstractSocket::ShareAddress);
+    rxBroadcast->bind(QHostAddress::Any, 17222, QAbstractSocket::ShareAddress);
 
     connect(rxBroadcast, SIGNAL(readyRead()), this, SLOT(readPendingDatagrams()));
 
@@ -85,7 +85,7 @@ void ConnectionWindow::readPendingDatagrams()
         if (!remoteDeviceIP.contains(datagram.senderAddress().toString()))
         {
             remoteDeviceIP.append(datagram.senderAddress().toString());
-            //qDebug() << "Add new remote IP " << datagram.senderAddress().toString();
+            qDebug() << "Add new remote IP " << datagram.senderAddress().toString();
         }
     }
 }
diff --git a/connections/gvretserial.cpp b/connections/gvretserial.cpp
index 4275f0f..4da0f3a 100644
--- a/connections/gvretserial.cpp
+++ b/connections/gvretserial.cpp
@@ -819,11 +819,14 @@ void GVRetSerial::procRXChar(unsigned char c)
             qDebug() << "Baud 0 = " << can0Baud;
             qDebug() << "Baud 1 = " << can1Baud;
             mBusData[0].mBus.setSpeed(can0Baud);
-            mBusData[1].mBus.setSpeed(can1Baud);
             mBusData[0].mBus.setActive(can0Enabled);
-            mBusData[1].mBus.setActive(can1Enabled);
             mBusData[0].mConfigured = true;
-            mBusData[1].mConfigured = true;
+            if (mBusData.count() > 1)
+            {
+                mBusData[1].mBus.setSpeed(can1Baud);
+                mBusData[1].mBus.setActive(can1Enabled);
+                mBusData[1].mConfigured = true;
+            }
 
             can0Baud |= 0x80000000;
             if (can0Enabled) can0Baud |= 0x40000000;