Fix new ambiguity warnings