More coverity fixes
More coverity patches