Fix EventEmitter not being instanced correctly