Fixes errors during rebasing