buttons: Some of fixes