More coverity cleanup