diff --git a/LibreMetaverse.StructuredData/JSON/IJsonWrapper.cs b/LibreMetaverse.StructuredData/JSON/IJsonWrapper.cs
index c56d42ac..18208a6c 100644
--- a/LibreMetaverse.StructuredData/JSON/IJsonWrapper.cs
+++ b/LibreMetaverse.StructuredData/JSON/IJsonWrapper.cs
@@ -50,7 +50,7 @@ namespace LitJson
         void SetBoolean  (bool val);
         void SetDouble   (double val);
         void SetInt      (int val);
-        void SetJsonType (JsonType type);
+        void SetJsonType (JsonType jtype);
         void SetLong     (long val);
         void SetString   (string val);
 
diff --git a/LibreMetaverse.StructuredData/JSON/JsonData.cs b/LibreMetaverse.StructuredData/JSON/JsonData.cs
index 76295a5c..bda21ed6 100644
--- a/LibreMetaverse.StructuredData/JSON/JsonData.cs
+++ b/LibreMetaverse.StructuredData/JSON/JsonData.cs
@@ -771,12 +771,12 @@ namespace LitJson
             return type;
         }
 
-        public void SetJsonType (JsonType type)
+        public void SetJsonType (JsonType jtype)
         {
-            if (this.type == type)
+            if (this.type == jtype)
                 return;
 
-            switch (type) {
+            switch (jtype) {
             case JsonType.None:
                 break;
 
@@ -810,7 +810,7 @@ namespace LitJson
                 break;
             }
 
-            this.type = type;
+            this.type = jtype;
         }
 
         public string ToJson ()
diff --git a/Programs/GridProxy/GridProxy.cs b/Programs/GridProxy/GridProxy.cs
index b72c4e17..3f6a14b2 100644
--- a/Programs/GridProxy/GridProxy.cs
+++ b/Programs/GridProxy/GridProxy.cs
@@ -301,12 +301,12 @@ namespace GridProxy
             }
         }
 
-        private Packet callDelegates(Dictionary<PacketType, List<PacketDelegate>> delegates, Packet packet, IPEndPoint remoteEndPoint)
+        private Packet callDelegates(Dictionary<PacketType, List<PacketDelegate>> delegates, Packet packet, IPEndPoint endpoint)
         {
             PacketType origType = packet.Type;
             foreach (PacketDelegate del in delegates[origType])
             {
-                try { packet = del(packet, remoteEndPoint); }
+                try { packet = del(packet, endpoint); }
                 catch (Exception ex) { OpenMetaverse.Logger.Log("Error in packet delegate", Helpers.LogLevel.Warning, ex); }
 
                 // FIXME: how should we handle the packet type changing?