consumer fixes