Switched to C++ compiler