Minor C++11 upadte