Cpp compile fixes