manually add these fixes to your branch.