Fixed more C++11 compatibility issues.