Producer fixes