Fixed rebase inconsistencies