More conversions to C++