Thumb fixes

A couple of minor fixes.  a96ac34 fixes #15007.