Fix more inspection issues