Thumb fixes

A couple of minor fixes.  7a125c5 fixes #15007.