Fixes for button recognition