more boolean comparison fixes