Fixed a few more c++11 issues.