Add event emitter arguments
Some minor tweaks for travis