Fixes to GenericInventory to work properly across multiple bots