minor events fixes