[Core] Fix errors after merge