diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 17faaa5d0..1cb29cd22 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -103,7 +103,7 @@
     <Compile Include="Source\Events\ArtifactEvent.cs" />
     <Compile Include="Source\GameSession\CargoManager.cs" />
     <Compile Include="Source\GameSession\GameModes\GameModePreset.cs" />
-    <Compile Include="Source\GameSession\GameModes\QuestMode.cs" />
+    <Compile Include="Source\GameSession\GameModes\MissionMode.cs" />
     <Compile Include="Source\GameSession\GameModes\Tutorials\BasicTutorial.cs" />
     <Compile Include="Source\GameSession\GameModes\Tutorials\EditorTutorial.cs" />
     <Compile Include="Source\GameSession\GameModes\Tutorials\TutorialType.cs" />
diff --git a/Subsurface/Source/Events/TaskManager.cs b/Subsurface/Source/Events/TaskManager.cs
index fc2437108..9642bbe0a 100644
--- a/Subsurface/Source/Events/TaskManager.cs
+++ b/Subsurface/Source/Events/TaskManager.cs
@@ -57,7 +57,7 @@ namespace Barotrauma
 
         private void CreateScriptedEvents(Level level)
         {
-            Random rand = new Random(ToolBox.StringToInt(level.Seed));
+            MTRandom rand = new MTRandom(ToolBox.StringToInt(level.Seed));
 
             float totalDifficulty = level.Difficulty;
 
diff --git a/Subsurface/Source/GameSession/GameModes/QuestMode.cs b/Subsurface/Source/GameSession/GameModes/MissionMode.cs
similarity index 71%
rename from Subsurface/Source/GameSession/GameModes/QuestMode.cs
rename to Subsurface/Source/GameSession/GameModes/MissionMode.cs
index 05efd8ddc..ea550e0da 100644
--- a/Subsurface/Source/GameSession/GameModes/QuestMode.cs
+++ b/Subsurface/Source/GameSession/GameModes/MissionMode.cs
@@ -1,14 +1,10 @@
 using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
     class MissionMode : GameMode
     {
-        Mission mission;
+        private Mission mission;
 
         public override Mission Mission
         {
@@ -23,7 +19,7 @@ namespace Barotrauma
         {
             Location[] locations = new Location[2];
 
-            Random rand = new Random(ToolBox.StringToInt(GameMain.NetLobbyScreen.LevelSeed));
+            MTRandom rand = new MTRandom(ToolBox.StringToInt(GameMain.NetLobbyScreen.LevelSeed));
 
             for (int i = 0; i < 2; i++)
             {
@@ -41,14 +37,6 @@ namespace Barotrauma
             Networking.GameServer.Log("Mission: " + mission.Name, Color.Cyan);
             Networking.GameServer.Log(mission.Description, Color.Cyan);
 
-            //quest.Start(Level.Loaded);
-        }
-
-        public override void End(string endMessage = "")
-        {
-            //quest.End();
-
-            base.End(endMessage);
         }
     }
 }
diff --git a/Subsurface/Source/Map/Map/Map.cs b/Subsurface/Source/Map/Map/Map.cs
index 4fc161460..eda9c03a5 100644
--- a/Subsurface/Source/Map/Map/Map.cs
+++ b/Subsurface/Source/Map/Map/Map.cs
@@ -383,7 +383,7 @@ namespace Barotrauma
                     int seed = (int)locations[0].MapPosition.X + (int)locations[0].MapPosition.Y * 100;
                     seed += (int)locations[1].MapPosition.X*10000 + (int)locations[1].MapPosition.Y * 1000000;
 
-                    Random rand = new Random(seed + missionsCompleted);
+                    MTRandom rand = new MTRandom(seed + missionsCompleted);
 
                     if (rand.NextDouble() < 0.3f) return null;