Some more coverity fixes