More constraints repair.