Fix more comments