Fixed rebase releated issues