More button state fixes