Fix more boolean checks and remove debug.