More coverity fixes