Fixes to consumer main.c.