Index: binary-improvements/7dtd-server-fixes/src/CustomCommands/Give.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/CustomCommands/Give.cs	(revision 196)
+++ binary-improvements/7dtd-server-fixes/src/CustomCommands/Give.cs	(revision 197)
@@ -36,14 +36,6 @@
 				}
 
-				ItemBase item = null;
-
-				foreach (ItemBase ib in ItemBase.list) {
-					if (ib.name != null && ib.name.ToLower ().Equals (_params [1].ToLower ())) {
-						item = ib;
-						break;
-					}
-				}
-
-				if (item == null) {
+				Nullable<ItemValue> iv = ItemList.Instance.GetItemValue(_params[1]);
+				if (iv == null) {
 					m_Console.SendResult ("Item not found.");
 					return;
@@ -57,5 +49,5 @@
 
 				EntityPlayer p = CommonMappingFunctions.GetEntityPlayer (ci);
-				CommonMappingFunctions.GetGameManager ().DropEntityItemServer (item.itemID, n, p.GetPosition (), Vector3.zero, Vector3.zero, 50, CommonMappingFunctions.GetEntityID (ci));
+				CommonMappingFunctions.GetGameManager ().DropEntityItemServer ((int)iv.Value.rawData, n, p.GetPosition (), Vector3.zero, Vector3.zero, 50, CommonMappingFunctions.GetEntityID (ci));
 
 				m_Console.SendResult ("Dropped item");
Index: binary-improvements/7dtd-server-fixes/src/CustomCommands/ListItems.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/CustomCommands/ListItems.cs	(revision 196)
+++ binary-improvements/7dtd-server-fixes/src/CustomCommands/ListItems.cs	(revision 197)
@@ -29,7 +29,7 @@
 
 				int n = 0;
-				foreach (ItemBase ib in ItemBase.list) {
-					if (ib.name != null && ib.name.ToLower ().Contains (_params [0].ToLower ())) {
-						m_Console.SendResult ("    " + ib.name);
+				foreach (string s in ItemList.Instance.ItemNames) {
+					if (s.ToLower ().Contains (_params [0].ToLower ())) {
+						m_Console.SendResult ("    " + s);
 						n++;
 					}