Fix some button issues