More Coverity fixes