event fixes