Minor stuff
No more c++11