GenericInventory.cs fixes