Coverity related changes