Two files patched for ambiguous overloads