diff --git a/Scripts/Skills/Tracking.cs b/Scripts/Skills/Tracking.cs
index 31a9d84de..6db6b8c2f 100644
--- a/Scripts/Skills/Tracking.cs
+++ b/Scripts/Skills/Tracking.cs
@@ -41,7 +41,7 @@ namespace Server.SkillHandlers
 			}
 		}
 
-		private static Hashtable m_Table = new Hashtable();
+		private static Dictionary<Mobile, TrackingInfo> m_Table = new Dictionary<Mobile, TrackingInfo>();
 
 		public static void AddInfo( Mobile tracker, Mobile target )
 		{
@@ -53,7 +53,8 @@ namespace Server.SkillHandlers
 		{
 			// Note: This is not reset as of publish 35.
 
-			TrackingInfo info = m_Table[tracker] as TrackingInfo;
+			TrackingInfo info = null;
+			m_Table.TryGetValue( tracker, out info );
 
 			if ( info == null || info.m_Target != target || info.m_Map != target.Map )
 				return 0.0;
diff --git a/Server/Gumps/GumpTextEntryLimited.cs b/Server/Gumps/GumpTextEntryLimited.cs
index c5ff2a4c3..d68800db7 100644
--- a/Server/Gumps/GumpTextEntryLimited.cs
+++ b/Server/Gumps/GumpTextEntryLimited.cs
@@ -128,21 +128,21 @@ namespace Server.Gumps
 			}
 		}
 
-		public TextEntryLimited( int x,	int	y, int width, int height, int hue, int id, string initialText, int size	)
+		public TextEntryLimited( int x,	int	y, int width, int height, int hue, int entryID, string initialText, int size )
 		{
 			m_X	= x;
 			m_Y	= y;
 			m_Width	= width;
 			m_Height = height;
 			m_Hue =	hue;
-			m_EntryID =	id;
+			m_EntryID =	entryID;
 			m_InitialText =	initialText;
 			m_Size = size;
 		}
 
 		public override	string Compile()
 		{
-			return String.Format( "{{ textentrylimited {0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10}	}}", m_X, m_Y, m_Width,	m_Height, m_Hue, m_ID, Parent.Intern( m_InitialText	), m_Size );
+			return String.Format( "{{ textentrylimited {0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10}	}}", m_X, m_Y, m_Width,	m_Height, m_Hue, m_EntryID, Parent.Intern( m_InitialText ), m_Size );
 		}
 
 		private	static byte[] m_LayoutName = Gump.StringToBuffer( "textentrylimited" );