Small improvemtns to C++ for K2 for POP