Corrected event arguments for all the options