C++11 compilation fixes