Tweaks to rebase