Removed c++11 warnings