Small fixes to fix build with C++11 compilers.