Inventory-related fixes

- [x] Uno!
- [x] Dos! (Done by not me)
- [x] Not even related to inventories anymore!
- [ ] Related to inventories