Minor coverity fixes