Fixed C++11 compile errors