Some event fixes