Inventory fixes

You can read the commit names for a description.