Code-Updates to C++11