Core: Fix build

(cherry picked from commit 81daef8b2205fca4310720d3186bafca8d75a792)