Fix build for changes in c.e.core.data