Inventory-related fixes

- [x] Uno!
- [ ] Dos!