fix small CPCHECK issues