More fixes for multiple consumers and verify code.
Description:

Testing: