Fixes for Plus/Minus buttons