Forgot to move a few ctors to C++11 style