Emitter fixes.