Fixes and Button upgrade