emitter bug fixes