Fix two ambiguity issues