Fixed c++11 branch issues.