Doing some makeup before the rebase