A couple of event fixes