Minor Emitter changes