diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
index 975bf4220..30061000b 100644
--- a/Subsurface/Source/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -27,6 +27,10 @@ namespace Barotrauma
             get { return netStateID; }
         }
 
+        List<char> memInput = new List<char>();
+        List<float> memMouseX = new List<float>();
+        List<float> memMouseY = new List<float>();
+
         //the Character that the player is currently controlling
         private static Character controlled;
 
diff --git a/Subsurface/Source/GameMain.cs b/Subsurface/Source/GameMain.cs
index fc7ce8017..3262949b8 100644
--- a/Subsurface/Source/GameMain.cs
+++ b/Subsurface/Source/GameMain.cs
@@ -104,7 +104,10 @@ namespace Barotrauma
                 
         public GameMain()
         {
-            Graphics = new GraphicsDeviceManager(this);
+            Graphics = new GraphicsDeviceManager(this)
+            {
+                SynchronizeWithVerticalRetrace = false,
+            };
 
             Window.Title = "Barotrauma";
 
@@ -143,6 +146,8 @@ namespace Barotrauma
             FarseerPhysics.Settings.ContinuousPhysics = false;
             FarseerPhysics.Settings.VelocityIterations = 1;
             FarseerPhysics.Settings.PositionIterations = 1;
+
+            Graphics.ApplyChanges();
         }
 
         /// <summary>