Fix SVACE and C++ issues