More fixes for button handling