Inventory logic fixes..