Fix ambiguity warnings