diff --git a/src/cpacketstream.cpp b/src/cpacketstream.cpp
index 27776b7..e3c4600 100644
--- a/src/cpacketstream.cpp
+++ b/src/cpacketstream.cpp
@@ -54,7 +54,13 @@ bool CPacketStream::Open(const CDvHeaderPacket &DvHeader, CClient *client)
         m_DvHeader = DvHeader;
         m_OwnerClient = client;
         m_LastPacketTime.Now();
-        m_CodecStream = g_Transcoder.GetStream(this, client->GetCodec());
+            if (DvHeader.GetRpt2Module() == 'A' || DvHeader.GetRpt2Module() == 'B' || DvHeader.GetRpt2Module() == 'C' || 
+                DvHeader.GetRpt2Module() == 'D' || DvHeader.GetRpt2Module() == 'E' || 
+                DvHeader.GetRpt2Module() == 'N' || DvHeader.GetRpt2Module() == 'T' || DvHeader.GetRpt2Module() == 'Y') {
+                m_CodecStream = g_Transcoder.GetStream(this, client->GetCodec());
+            } else {
+                m_CodecStream = g_Transcoder.GetStream(this, CODEC_NONE);
+            }
         ok = true;
     }
     return ok;
diff --git a/src/main.h b/src/main.h
index 7c19c7f..e067588 100644
--- a/src/main.h
+++ b/src/main.h
@@ -62,8 +62,8 @@
 
 // reflector ---------------------------------------------------
 
-#define NB_OF_MODULES                 10
-//#define NB_OF_MODULES                   NB_MODULES_MAX
+//#define NB_OF_MODULES                 10
+#define NB_OF_MODULES                   NB_MODULES_MAX
 
 // protocols ---------------------------------------------------
 
@@ -119,17 +119,17 @@
 #define YSF_PORT                        42000                               // UDP port
 #define YSF_KEEPALIVE_PERIOD            3                                   // in seconds
 #define YSF_KEEPALIVE_TIMEOUT           (YSF_KEEPALIVE_PERIOD*10)           // in seconds
-#define YSF_DEFAULT_NODE_TX_FREQ        437000000                           // in Hz
-#define YSF_DEFAULT_NODE_RX_FREQ        437000000                           // in Hz
-#define YSF_AUTOLINK_ENABLE             0                                   // 1 = enable, 0 = disable auto-link
-#define YSF_AUTOLINK_MODULE             'B'                                 // module for client to auto-link to
+#define YSF_DEFAULT_NODE_TX_FREQ        146237500                           // in Hz
+#define YSF_DEFAULT_NODE_RX_FREQ        146237500                           // in Hz
+#define YSF_AUTOLINK_ENABLE             1                                   // 1 = enable, 0 = disable auto-link
+#define YSF_AUTOLINK_MODULE             'Y'                                 // module for client to auto-link to
 
 // G3 Terminal
 #define G3_PRESENCE_PORT                12346                               // UDP port
 #define G3_CONFIG_PORT                  12345                               // UDP port
 #define G3_DV_PORT                      40000                               // UDP port
 #define G3_KEEPALIVE_PERIOD             10                                  // in seconds
-#define G3_KEEPALIVE_TIMEOUT            3600                                // in seconds, 1 hour
+#define G3_KEEPALIVE_TIMEOUT            (G3_KEEPALIVE_PERIOD*10)            // in seconds
 
 
 // Transcoder server --------------------------------------------