Initial C++11 changes