Last fixes to the rebase.