Fixes to tap producer