Coverity fixes (A. Shabetai)