Fixing the stuff that got overwriten by merging (again!).