Some rebase errors corrected.