More changes for rebase