fix some cpp issues