Re #9531. A couple of corrections to make Fit work