some more coverity fixes