Fix more booleans