Fixed class vars in boolean operators;