cppcheck warnings that are marked as warning

Third patch.