more CPP fixes