fixing C++ and Neko support