more thumb fixes