diff --git a/bridge_master.py b/bridge_master.py
index 444235c..440e193 100755
--- a/bridge_master.py
+++ b/bridge_master.py
@@ -526,6 +526,8 @@ def ident():
 def options_config():
     logger.debug('(OPTIONS) Running options parser')
     for _system in CONFIG['SYSTEMS']:
+        if CONFIG['SYSTEMS'][_system]['MODE'] != 'MASTER':
+            continue
         if CONFIG['SYSTEMS'][_system]['ENABLED'] == True:
             if 'OPTIONS' in CONFIG['SYSTEMS'][_system]:
                 _options = {}
@@ -1425,7 +1427,7 @@ class routerHBP(HBSYSTEM):
         _int_dst_id = int_id(_dst_id)
         
         #Handle private calls (for reflectors)
-        if _call_type == 'unit' and _slot == 2:
+        if _call_type == 'unit':
             if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']):
                 logger.warning('(%s) Reflector: Private call from %s to %s',self._system, int_id(_rf_src), _int_dst_id)
                 #if _int_dst_id >= 4000 and _int_dst_id <= 5000:
@@ -1544,7 +1546,7 @@ class routerHBP(HBSYSTEM):
                     for num in str(_int_dst_id):
                         _say.append(words[num])
      
-                speech = pkt_gen(bytes_3(5000), _nine, bytes_4(9), 1, _say)
+                speech = pkt_gen(bytes_3(5000), _nine, bytes_4(9), _slot, _say)
                 
                 #call speech in a thread as it contains sleep() and hence could block the reactor
                 reactor.callInThread(sendSpeech,self,speech)