diff --git a/user/advanced-configuration/disposablevm-customization.md b/user/advanced-configuration/disposablevm-customization.md
index 1e14eddd..35680337 100644
--- a/user/advanced-configuration/disposablevm-customization.md
+++ b/user/advanced-configuration/disposablevm-customization.md
@@ -15,9 +15,9 @@ redirect_from:
 
 ## Introduction
 
-A DisposableVM (previously known as a "DispVM") in can be based on any TemplateBasedVM.
-You can also choose to use different DisposableVM Templates for different DisposableVMs.
-To prepare AppVM to be a DisposableVM Template, you need to set `template_for_dispvms` property, for example:
+A [DisposableVM](/doc/disposablevm) can be based on any [TemplateBasedVM](/doc/glossary/#templatebasedvm).
+You can also choose to use different [DisposableVM Templates](/doc/glossary/#disposablevm-template) for different DisposableVMs.
+To prepare an AppVM to be a DisposableVM Template, you need to set `template_for_dispvms` property, for example:
 
     [user@dom0 ~]$ qvm-prefs fedora-26-dvm template_for_dispvms True
 
diff --git a/user/reference/glossary.md b/user/reference/glossary.md
index 9f01fb71..2358aa14 100644
--- a/user/reference/glossary.md
+++ b/user/reference/glossary.md
@@ -119,8 +119,9 @@ FirewallVM
 FirewallVMs, as defined here, no longer exist in Qubes 4.0 or later (see [here][pr-748] for technical details).*
 
 Firewall Virtual Machine. 
-A type of [ProxyVM](#proxyvm) that is used to enforce network-level policies (a.k.a. "firewall rules"). 
+A type of [ProxyVM](#proxyvm) that is used to enforce network-level policies (a.k.a. "firewall rules").
 A FirewallVM called `sys-firewall` is created by default in most Qubes installations.
+Also see [Qubes Firewall](/doc/firewall/).
 
 DisposableVM
 ------------
@@ -191,7 +192,8 @@ This allows for optimal performance on guest operating systems such as Windows.
 
 Windows Tools
 -----
-Qubes Windows Tools are a set of programs and drivers that provide integration of Windows [AppVMs](#appvm) with the rest of the Qubes system.
+[Qubes Windows Tools](/doc/windows-tools/) (QWT) are a set of programs and drivers that provide integration of Windows [AppVMs](#appvm) with the rest of the Qubes system.
+Also see [Windows](/doc/windows/).
 
 QWT
 ----