Resolve more warnings around ambiguous method resolution