Minor fixes to a mangled function.
More merge conflicts