More c++11 cleanup