Merge "C/C++ adjustments and bug fixes."