events fixes