Minor Coverity fixes