Coverity issues fixed