diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index b0be492e13..61a7cae33c 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -1823,7 +1823,7 @@ _settok_setParentPag(afs_ucred_t **cred) {
     osi_procname(procname, 256);
     afs_warnuser("Process %d (%s) tried to change pags in PSetTokens\n",
 	         MyPidxx2Pid(MyPidxx), procname);
-    return setpag(osi_curporc(), cred, -1, &pag, 1);
+    return setpag(osi_curproc(), cred, -1, &pag, 1);
 #else
     return setpag(cred, -1, &pag, 1);
 #endif
diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c
index 187ee4c875..422659e05d 100644
--- a/src/rx/FBSD/rx_knet.c
+++ b/src/rx/FBSD/rx_knet.c
@@ -108,8 +108,7 @@ osi_StopListener(void)
 	       "rx_shutdown_timedwait", 1 * hz);
 	--tries;
       }
-      if (so_is_disconn(rx_socket))
-          soclose(rx_socket);
+      soclose(rx_socket);
       MUTEX_EXIT(&s_mtx);
       MUTEX_DESTROY(&s_mtx);
     }