Fixed some breaking changes by events portal