Fixed more C++ compiler warnings