cpp fixes

fixes for c++