Vocabulary fixes