Fix more coverity warnings