Make a few things a bit more C++(11)