Improve consistency in boolean variables values