Fixing few C++11 releated stuff. #5