Fix up some extension method resolution