Fixed some minor things for the CPP target