Fix some CPP