diff --git a/OpenMetaverse/AgentManagerMovement.cs b/OpenMetaverse/AgentManagerMovement.cs
index 2b4f7f29..b3927fc8 100644
--- a/OpenMetaverse/AgentManagerMovement.cs
+++ b/OpenMetaverse/AgentManagerMovement.cs
@@ -380,11 +380,9 @@ namespace OpenMetaverse
             /// <summary>The current value of the agent control flags</summary>
             public uint AgentControls
             {
-                get
-                {
-                    return agentControls;
-                }
+                get { return agentControls; }
             }
+
             /// <summary>Gets or sets the interval in milliseconds at which
             /// AgentUpdate packets are sent to the current simulator. Setting
             /// this to a non-zero value will also enable the packet sending if
@@ -462,7 +460,7 @@ namespace OpenMetaverse
             /// <summary>Timer for sending AgentUpdate packets</summary>
             private Timer updateTimer;
             private int updateInterval;
-            private bool autoResetControls = true;
+            private bool autoResetControls;
 
             /// <summary>Default constructor</summary>
             public AgentMovement(GridClient client)
diff --git a/Programs/examples/TestClient/Commands/ScriptCommand.cs b/Programs/examples/TestClient/Commands/ScriptCommand.cs
index 84a54465..5d334ec3 100644
--- a/Programs/examples/TestClient/Commands/ScriptCommand.cs
+++ b/Programs/examples/TestClient/Commands/ScriptCommand.cs
@@ -19,8 +19,8 @@ namespace OpenMetaverse.TestClient
                 return "Usage: script [filename]";
 
             // Load the file
-            string[] lines = null;
-            try { File.ReadAllLines(args[0]); }
+            string[] lines;
+            try { lines = File.ReadAllLines(args[0]); }
             catch (Exception e) { return e.Message; }
 
             // Execute all of the commands