Compile fixes for C++11