Fix some more (clang++) compiler warnings