Fix Coverity Issues-2