Modify harnesses to use min everywhere