Fix two more ambiguity issues