Fixes to button inputs