Lexicon fixes