More event bug fixes