Fixes and button