Cleaned up a couple C++ errors.