Fixes to Inventory