Fixed some consumer related stuff