More tweaks to the inventory stuff