lexicon and fallback: minor fixes