diff --git a/API.py b/API.py
index d84d010..e2e8521 100644
--- a/API.py
+++ b/API.py
@@ -64,7 +64,11 @@ class FD_API(ServiceBase):
     def version(ctx, sessionid):
         return(FD_API._version)
 
-    @rpc(Unicode,Unicode, _returns=Unicode())
+    @rpc()
+    def dummy(ctx):
+        pass
+
+    @rpc(Unicode,Unicode)
     def reset(ctx,dmrid,key):
         system = ctx.udc.validateKey(int(dmrid),key)
         if system:
@@ -72,7 +76,7 @@ class FD_API(ServiceBase):
         else:
             raise error.InvalidCredentialsError()
 
-    @rpc(UnsignedInteger32,Unicode,Unicode,_returns=Unicode())
+    @rpc(UnsignedInteger32,Unicode,Unicode)
     def setoptions(ctx,dmrid,key,options):
         system = ctx.udc.validateKey(int(dmrid),key)
         if system:
@@ -80,7 +84,7 @@ class FD_API(ServiceBase):
         else:
             raise error.InvalidCredentialsError()
 
-    @rpc(UnsignedInteger32,_returns=(Unicode()))
+    @rpc(UnsignedInteger32)
     def killserver(ctx,killkey):
         pass
 
diff --git a/bridge_master.py b/bridge_master.py
index 2363bd8..c32776b 100644
--- a/bridge_master.py
+++ b/bridge_master.py
@@ -1036,7 +1036,7 @@ def options_config():
                             logger.debug('(OPTIONS) %s default reflector changed, updating',_system) 
                             reset_default_reflector(CONFIG['SYSTEMS'][_system]['DEFAULT_REFLECTOR'],_tmout,_system)
                             make_default_reflector(int(_options['DEFAULT_REFLECTOR']),_tmout,_system)
-                        elif int(_options['DEFAULT_REFLECTOR']) in prohibitedTGs:
+                        elif int(_options['DEFAULT_REFLECTOR']) in prohibitedTGs and not bool(_options['DEFAULT_REFLECTOR']):
                             logger.debug('(OPTIONS) %s default reflector is prohibited, ignoring change',_system)
 
                         else: