Fix EventEmitter on clients