Fix vocabularies