Update up to changes in event-emitter package
Update up to changes in d package