Button helper fixes