[Core] Fixed up project build with more Zero updates