Prepare for C++11