diff --git a/host/Host.cpp b/host/Host.cpp
index f9755697..d34024c1 100644
--- a/host/Host.cpp
+++ b/host/Host.cpp
@@ -1696,7 +1696,7 @@ bool Host::createModem()
     m_modem->setRFParams(m_rxFrequency, m_txFrequency, rxTuning, txTuning, rfPower, dmrDiscBWAdj, p25DiscBWAdj, dmrPostBWAdj, p25PostBWAdj, adfGainMode);
     m_modem->setDMRColorCode(m_dmrColorCode);
     m_modem->setP25NAC(m_p25NAC);
-#ifdef ENABLE_DFSI_SUPPORT
+#if ENABLE_DFSI_SUPPORT
     m_modem->setP25DFSI(m_useDFSI);
 #endif
 
diff --git a/p25/Control.cpp b/p25/Control.cpp
index 5ace0bb9..0e55d1e0 100644
--- a/p25/Control.cpp
+++ b/p25/Control.cpp
@@ -247,7 +247,7 @@ void Control::setOptions(yaml::Node& conf, const std::string cwCallsign, const s
 
 #if ENABLE_DFSI_SUPPORT
     if (m_modem->isP25DFSI()) {
-        m_trunk->m_ctrlTSDUMBF = true; // force SBF for TSDUs when using DFSI
+        m_trunk->m_ctrlTSDUMBF = false; // force SBF for TSDUs when using DFSI
     }
 #endif
 
@@ -323,11 +323,19 @@ void Control::setOptions(yaml::Node& conf, const std::string cwCallsign, const s
         m_nid.setTxNAC(m_txNAC);
     }
 
-    m_voice->resetRF();
-    m_voice->resetNet();
-    m_data->resetRF();
-    m_trunk->resetRF();
-    m_trunk->resetNet();
+    if (m_voice != NULL) {
+        m_voice->resetRF();
+        m_voice->resetNet();
+    }
+
+    if (m_data != NULL) {
+        m_data->resetRF();
+    }
+
+    if (m_trunk != NULL) {
+        m_trunk->resetRF();
+        m_trunk->resetNet();
+    }
 }
 
 /// <summary>