Fix weird rebasing issues