Fix more coverity issues