Fix C++11 issues.