minor updates before the merge for 71X