Minor event bugs