[Core] Minor vs build fixes