A few more coverity fixes