Rebase after - Fix bugs