Some fixes for the events