some more c++11 porting