Glossary fixes