diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index a2f6a119d7..ec16d7c26f 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private Dictionary<int, Queue<PollServiceHttpRequest>> m_bycontext;
         private BlockingCollection<PollServiceHttpRequest> m_requests = new BlockingCollection<PollServiceHttpRequest>();
-        private static ConcurrentQueue<PollServiceHttpRequest> m_retryRequests = new ConcurrentQueue<PollServiceHttpRequest>();
+        private ConcurrentQueue<PollServiceHttpRequest> m_retryRequests = new ConcurrentQueue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
@@ -235,7 +235,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     continue;
                 }
 
-                Watchdog.UpdateThread();               
+                Watchdog.UpdateThread();
 
                 try
                 {
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 11904622f1..523ccba1cd 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -364,7 +364,7 @@ namespace OpenSim.Framework.Servers
                 if (ipaddr != null)
                     m_Servers[port].ListenIPAddress = ipaddr;
 
-                m_Servers[port].Start(false,  false);
+                m_Servers[port].Start();
 
                 return m_Servers[port];
             }