Tweaked InventoryUtil