diff --git a/media-dispatcher b/media-dispatcher
index 2ddb652..943ffbd 100644
--- a/media-dispatcher
+++ b/media-dispatcher
@@ -1,62 +1,60 @@
 #!/usr/bin/env python
 
 
 if __name__ == '__main__':
     import sys
     from optparse import OptionParser
     from application.process import process, ProcessError
     from application.configuration import ConfigFile, datatypes
     from application import log
     import mediaproxy
 
     name = 'media-dispatcher'
     fullname = 'MediaProxy Dispatcher'
     description = 'MediaProxy Dispatcher component'
 
     default_pid = mediaproxy.runtime_directory + '/dispatcher.pid'
 
     parser = OptionParser(version="%%prog %s" % mediaproxy.__version__)
     parser.add_option("--no-fork", action="store_false", dest="fork", default=1, help="run the process in the foreground (for debugging)")
     parser.add_option("--pid", dest="pid_file", default=default_pid, help="pid file (%s)" % default_pid, metavar="File")
     (options, args) = parser.parse_args()
 
-    pid_file = options.pid_file
-
     process.system_config_directory = mediaproxy.config_directory
     config_file = ConfigFile(mediaproxy.configuration_file)
     log.level.current = config_file.get_setting('Dispatcher', 'log_level', type=datatypes.LogLevel, default=log.level.DEBUG)
 
     try:
         process.runtime_directory = mediaproxy.runtime_directory
     except ProcessError, e:
         log.critical('Cannot start %s: %s' % (fullname, e))
         sys.exit(1)
 
     if options.fork:
         try:
-            process.daemonize(pid_file)
+            process.daemonize(options.pid_file)
         except ProcessError, e:
             log.critical('Cannot start %s: %s' % (fullname, e))
             sys.exit(1)
         log.use_syslog(name)
 
     log.info('Starting %s %s' % (fullname, mediaproxy.__version__))
 
     from mediaproxy.dispatcher import Dispatcher
 
     if not options.fork:
         from application.debug.memory import memory_dump
 
     try:
         dispatcher = Dispatcher()
     except Exception, e:
         log.critical('Failed to create %s: %s' % (fullname, e))
         if e.__class__ is not RuntimeError:
             log.exception()
         sys.exit(1)
 
     dispatcher.run()
 
     if not options.fork:
         #from application.debug.memory import memory_dump
         memory_dump()
diff --git a/media-relay b/media-relay
index e479e56..629b395 100644
--- a/media-relay
+++ b/media-relay
@@ -1,104 +1,102 @@
 #!/usr/bin/env python
 
 
 if __name__ == '__main__':
     import errno
     import sys
     import subprocess
     from optparse import OptionParser
     from application import log
     from application.configuration import ConfigFile, datatypes
     from application.process import process, ProcessError
     from application.version import Version
     import mediaproxy
 
     IP_FORWARD_FILE     = '/proc/sys/net/ipv4/ip_forward'
     CONNTRACK_ACCT_FILE = '/proc/sys/net/netfilter/nf_conntrack_acct'
     KERNEL_VERSION_FILE = '/proc/sys/kernel/osrelease'
 
     name = 'media-relay'
     fullname = 'MediaProxy Relay'
     description = 'MediaProxy Relay component'
 
     default_pid = mediaproxy.runtime_directory + '/relay.pid'
 
     parser = OptionParser(version="%%prog %s" % mediaproxy.__version__)
     parser.add_option("--no-fork", action="store_false", dest="fork", default=1, help="run the process in the foreground (for debugging)")
     parser.add_option("--pid", dest="pid_file", default=default_pid, help="pid file (%s)" % default_pid, metavar="File")
     (options, args) = parser.parse_args()
 
     if not sys.platform.startswith('linux'):
         log.critical('Cannot start %s. A Linux host is required for operation.' % fullname)
         sys.exit(1)
 
     try:
         subprocess.call(['modprobe', 'ip_tables'], env={'PATH': '/usr/sbin:/sbin:/usr/bin:/bin'})
     except OSError, e:
         log.critical('Cannot start %s: failed to load the ip_tables kernel module: %s' % (fullname, e))
         sys.exit(1)
 
     try:
         kernel_version = Version.parse(open(KERNEL_VERSION_FILE).read().strip())
     except (OSError, IOError, ValueError):
         log.critical('Could not determine Linux kernel version')
         sys.exit(1)
 
     if kernel_version < Version(2, 6, 18):
         log.critical('Linux kernel version 2.6.18 or newer is required to run the media relay')
         sys.exit(1)
 
     try:
         ip_forward = bool(int(open(IP_FORWARD_FILE).read()))
     except (OSError, IOError, ValueError):
         ip_forward = False
 
     if not ip_forward:
         log.critical('IP forwarding is not available or not enabled (check %s)' % IP_FORWARD_FILE)
         sys.exit(1)
 
     try:
         with open(CONNTRACK_ACCT_FILE, 'w') as acct_file:
             acct_file.write('1')
     except (IOError, OSError), e:
         if e.errno != errno.ENOENT:
             log.critical('Could not enable conntrack rule counters (check %s): %s' % (CONNTRACK_ACCT_FILE, e))
             sys.exit(1)
 
-    pid_file = options.pid_file
-
     process.system_config_directory = mediaproxy.config_directory
     config_file = ConfigFile(mediaproxy.configuration_file)
     log.level.current = config_file.get_setting('Relay', 'log_level', type=datatypes.LogLevel, default=log.level.DEBUG)
 
     try:
         process.runtime_directory = mediaproxy.runtime_directory
     except ProcessError, e:
         log.critical('Cannot start %s: %s' % (fullname, e))
         sys.exit(1)
 
     if options.fork:
         try:
-            process.daemonize(pid_file)
+            process.daemonize(options.pid_file)
         except ProcessError, e:
             log.critical('Cannot start %s: %s' % (fullname, e))
             sys.exit(1)
         log.use_syslog(name)
 
     log.info('Starting %s %s' % (fullname, mediaproxy.__version__))
 
     try:
         from mediaproxy.relay import MediaRelay
         if not options.fork:
             from application.debug.memory import memory_dump
         relay = MediaRelay()
     except Exception, e:
         log.critical('Failed to create %s: %s' % (fullname, e))
         if e.__class__ is not RuntimeError:
             log.exception()
         sys.exit(1)
 
     relay.run()
 
     if not options.fork:
         #from application.debug.memory import memory_dump
         memory_dump()