Fixed master cpp compile