- More fixes to inventory handling (issue #233).