Fixes to hide hold button as appropriate