Few more boolean fix