Rebasing fixes.