Inventory-related fixes

Technically the first one is an addition, but meh