[Core] Fixed up build after recent merges