More comparison changes