Fix emitter methods