Plus to minus shortcuts rebase fixes