Disambiguator fixes