Some fixes to test consumer