Inventory bug fixes