diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index 3251ec1ee85..1a3ad5ca92a 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -738,8 +738,10 @@ traverses the tail queue referenced by
 .Fa head
 in the forward direction, assigning each element in turn to
 .Fa var .
-.Fa Var 
-is set to NULL if the loop completes normally, or if there were no elements.
+.Fa var
+is set to
+.Dv NULL
+if the loop completes normally, or if there were no elements.
 .Pp
 The macro
 .Nm TAILQ_FOREACH_REVERSE
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index e89443befcc..6d057485237 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -58,7 +58,7 @@ most easily done with the
 .Xr ifconfig 8
 .Cm create
 command or using the
-.No gifconfig_ Ns Em interface
+.Va gifconfig_ Ns Aq Ar interface
 variable in
 .Xr rc.conf 5 .
 .Pp