Minor event fixes