Fix all ambiguities