Vocabulary and reactivity fixes