Some additional coverity fixes.