Tweak minor problems in L61114 fix.