More consumer fixes