diff --git a/Admin/Server.cs b/Admin/Server.cs
index 1fc6aeab..9fdad925 100644
--- a/Admin/Server.cs
+++ b/Admin/Server.cs
@@ -845,7 +845,7 @@ namespace IW4MAdmin
             }
             catch (Exception E)
             {
-                Log.Write("Error during initialization - " + E.Message, Log.Level.All);
+                Log.Write("Error during initialization - " + E.Message +"--" + E.StackTrace, Log.Level.All);
                 return false;
             }
         }
diff --git a/Admin/Utilities.cs b/Admin/Utilities.cs
index 075729dd..3dc1d5f7 100644
--- a/Admin/Utilities.cs
+++ b/Admin/Utilities.cs
@@ -521,7 +521,7 @@ namespace IW4MAdmin
             if (ThreadHandle == null || ThreadHandle == IntPtr.Zero)
                 return;
 
-            WaitForSingleObject(ThreadHandle, 5000);
+            WaitForSingleObject(ThreadHandle, 500000);
 
             // cleanup
             if (!VirtualFreeEx(ProcessHandle, codeAllocation, 0, AllocationType.Release))
@@ -593,7 +593,7 @@ namespace IW4MAdmin
             if (ThreadHandle == null || ThreadHandle == IntPtr.Zero)
                 return requestedDvar;
 
-            WaitForSingleObject(ThreadHandle, 5000);
+            WaitForSingleObject(ThreadHandle, 500000);
 
             if (!VirtualFreeEx(ProcessHandle, codeAllocation, 0, AllocationType.Release))
                 Console.WriteLine(Marshal.GetLastWin32Error());
diff --git a/Admin/WebFront.cs b/Admin/WebFront.cs
index 6db1643b..38c6de7c 100644
--- a/Admin/WebFront.cs
+++ b/Admin/WebFront.cs
@@ -123,7 +123,7 @@ namespace IW4MAdmin_Web
                                     }
                                 }
 
-                                players.AppendFormat("<td><a href='/{0}/{1}/userip/?player'>{2}</a></td>", Servers[i].pID(), P.getDBID(), IW4MAdmin.Utilities.nameHTMLFormatted(P));
+                                players.AppendFormat("<td><a href='/{0}/{1}/userip/?player'>{2}</a></td>", i, P.getDBID(), IW4MAdmin.Utilities.nameHTMLFormatted(P));
 
                                 if (count % 2 != 0)
                                 {