Cpp compile fixes for 49fab616f27b82323dfbfe0757c878f2dddc12f3