Clean up and fix producer bug