Fix equals checks