some event fixes