fixes to Consumer