Fixed some issues with EventArgs