Cleaning up warnings for C++11 standard