resolve coverity scan issues