Fixes for c++11 build.