Add fixup for pcs order constraints after update to new templates