Minor cleanups
Correctly detect C++ (was detecting C as C++)