Various glossary fixes