changes for coverity issues