Fix comparison classes