Inventory fixes