Fixes in Emitter.