diff --git a/SickBeard.py b/SickBeard.py
index 79267797..9c182bef 100755
--- a/SickBeard.py
+++ b/SickBeard.py
@@ -18,6 +18,8 @@
 # along with SickRage.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check needed software dependencies to nudge users to fix their setup
+from __future__ import with_statement
+
 import sys
 
 if sys.version_info < (2, 6):
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 701606fb..86bdf6f9 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -3277,14 +3277,12 @@ class Home(IndexHandler):
         if str(pid) != str(sickbeard.PID):
             self.redirect("/home/")
 
-        # auto-reload
-        tornado.autoreload.start(IOLoop.current())
-
         updated = sickbeard.versionCheckScheduler.action.update()  # @UndefinedVariable
-
         if updated:
             # do a hard restart
-            #threading.Timer(2, sickbeard.invoke_restart, [False]).start()
+            if not sickbeard.AUTO_UPDATE:
+                threading.Timer(2, sickbeard.invoke_restart, [False]).start()
+
             t = PageTemplate(file="restart_bare.tmpl")
             return _munge(t)
         else:
diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py
index f333d845..61cd31ca 100644
--- a/sickbeard/webserveInit.py
+++ b/sickbeard/webserveInit.py
@@ -103,7 +103,7 @@ def initWebServer(options={}):
                         cookie_secret='61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o/Vo='
     )
 
-    # Index Handler
+    # Main Handler
     app.add_handlers(".*$", [
         (r"/", RedirectHandler, {'url': '%s/home/' % options['web_root']}),
         (r'%s/api/(.*)(/?)' % options['web_root'], webapi.Api),
@@ -121,7 +121,9 @@ def initWebServer(options={}):
         (r'%s/%s/(.*)(/?)' % (options['web_root'], 'css'), MultiStaticFileHandler,
          {'paths': [os.path.join(options['data_root'], 'css')]}),
         (r'%s/%s/(.*)(/?)' % (options['web_root'], 'js'), MultiStaticFileHandler,
-         {'paths': [os.path.join(options['data_root'], 'js')]})
+         {'paths': [os.path.join(options['data_root'], 'js'),
+                    os.path.join(options['data_root'], 'js/lib'),
+                    os.path.join(options['data_root'], 'js/fancybox')]})
 
     ])