Rebasing fixes