Fix build for current OeC version