diff --git a/games/pom/pom.6 b/games/pom/pom.6
index 60f7b401062f..b77b66b486fc 100644
--- a/games/pom/pom.6
+++ b/games/pom/pom.6
@@ -34,6 +34,7 @@
 .\"
 .Dd May 31, 1993
 .Dt POM 6
+.Os
 .Sh NAME
 .Nm pom
 .Nd display the phase of the moon
diff --git a/lib/libgssapi/gss_compare_name.3 b/lib/libgssapi/gss_compare_name.3
index 0bafb5964081..713af232da4a 100644
--- a/lib/libgssapi/gss_compare_name.3
+++ b/lib/libgssapi/gss_compare_name.3
@@ -28,7 +28,7 @@
 .\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
-.Dt GSS_COMPARE_NAME PRM
+.Dt GSS_COMPARE_NAME 3 PRM
 .Os
 .Sh NAME
 .Nm gss_compare_name
diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3
index 230a11085787..5155eb663e65 100644
--- a/lib/libpmc/pmc.ucf.3
+++ b/lib/libpmc/pmc.ucf.3
@@ -111,5 +111,3 @@ The
 library was written by
 .An "Joseph Koshy"
 .Aq jkoshy@FreeBSD.org .
-
-
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index 94d0e1386e74..f355fd215622 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -183,4 +183,3 @@ by
 and
 .An Scott Long Aq scottl@FreeBSD.org
 have made more substantial improvements.
-.Sh BUGS
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index 00af8a89dc85..65cf3d3a5959 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -158,14 +158,14 @@ The
 function is equivalent to the call
 .Bd -literal -offset indent
 make_dev_credf(0, cdevsw, unit, cr, uid, gid, perms, fmt, ...);
-.Ed .
+.Ed
 .Pp
 The
 .Fn make_dev
 function call is the same as
 .Bd -literal -offset indent
 make_dev_credf(0, cdevsw, unit, NULL, uid, gid, perms, fmt, ...);
-.Ed .
+.Ed
 .Pp
 The
 .Fn make_dev_alias
@@ -245,7 +245,7 @@ The
 function is the same as
 .Bd -literal -offset indent
 destroy_dev_sched(cdev, NULL, NULL);
-.Ed .
+.Ed
 .Pp
 The
 .Fn d_close
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index ed828a7deed3..d9efccfd5dc6 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -48,8 +48,6 @@
 .Oc
 .Op Fl e Ar string
 .Op Fl o Ar list
-.Bk -words
-.Ek
 .Op Fl t Ar char
 .Op Fl 1 Ar field
 .Op Fl 2 Ar field
diff --git a/usr.bin/newkey/newkey.8 b/usr.bin/newkey/newkey.8
index 09b00e9f47d3..80e25575a3a0 100644
--- a/usr.bin/newkey/newkey.8
+++ b/usr.bin/newkey/newkey.8
@@ -16,13 +16,13 @@ The
 .Nm
 utility is normally run by the network administrator on the
 Network Interface Service
-(\s-1NIS\s0)
+.Pq NIS
 master machine in order to establish public keys for
 users and super-users on the network.
 These keys are needed for using secure
 RPC
 or secure
-NFS\s0.
+NFS .
 .Pp
 The
 .Nm
@@ -52,8 +52,8 @@ password of the given username.
 .Xr keyserv 8
 .Sh NOTES
 The Network Information Service
-(\s-1NIS\s0)
+.Pq NIS
 was formerly known as Sun Yellow Pages
-(\s-1YP\s0).
+.Pq YP .
 The functionality of the two remains the same;
 only the name has changed.