More prep & C++11 stuff