diff --git a/configure.py b/configure.py
index 29b97732080..556b68d43dd 100755
--- a/configure.py
+++ b/configure.py
@@ -1869,7 +1869,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_clerkt"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_coach"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_df"),
-    ActorRel(NonMatching, "d_a_npc_doc"),
+    ActorRel(MatchingFor(ALL_GCN), "d_a_npc_doc"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_doorboy"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_drainSol"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_du"),
diff --git a/include/d/actor/d_a_npc_doc.h b/include/d/actor/d_a_npc_doc.h
index e6f1a49e31e..c8ed81acae8 100644
--- a/include/d/actor/d_a_npc_doc.h
+++ b/include/d/actor/d_a_npc_doc.h
@@ -107,7 +107,7 @@ public:
     int getOffHour() {
         u16 var_r31 = (u16)home.angle.z;
         var_r31 &= (u16)0x3E0;
-        var_r31 >>= 5;
+        var_r31 = var_r31 >> 5;
 
         if (var_r31 < 24) {
             return var_r31;
diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp
index 31b17c9eba6..a35eb050fb0 100644
--- a/src/d/actor/d_a_npc_doc.cpp
+++ b/src/d/actor/d_a_npc_doc.cpp
@@ -532,7 +532,6 @@ void daNpc_Doc_c::action() {
 }
 
 /* 809A7F3C-809A80B8 00139C 017C+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Doc_cFv */
-// NONMATCHING - small regalloc with getOffHour
 void daNpc_Doc_c::beforeMove() {
     if (mType == 0 && field_0xe34 == 0) {
         int hour = 0;