Fix vocabulary bugs.