Some fixes for non C++11 compilers.