More event fixes