Event api break fixes and cleanup