Fix bool vars