Fix misc points of emitter