Patch rebase discrepanies