Fixes to some of the buttons