More Inventory fixes