diff --git a/src/engine/behavior_script.c b/src/engine/behavior_script.c
index 30db5d76b..66b57abcc 100644
--- a/src/engine/behavior_script.c
+++ b/src/engine/behavior_script.c
@@ -894,25 +894,18 @@ void cur_obj_update(void) {
     }
 
 #if SILHOUETTE
-    COND_BIT((  objFlags & OBJ_FLAG_SILHOUETTE         ), o->header.gfx.node.flags, GRAPH_RENDER_SILHOUETTE        );
-    COND_BIT((  objFlags & OBJ_FLAG_OCCLUDE_SILHOUETTE ), o->header.gfx.node.flags, GRAPH_RENDER_OCCLUDE_SILHOUETTE);
+    COND_BIT((objFlags & OBJ_FLAG_SILHOUETTE        ), o->header.gfx.node.flags, GRAPH_RENDER_SILHOUETTE        );
+    COND_BIT((objFlags & OBJ_FLAG_OCCLUDE_SILHOUETTE), o->header.gfx.node.flags, GRAPH_RENDER_OCCLUDE_SILHOUETTE);
 #endif
+
 #ifdef OBJECTS_REJ
-    s32 objListIndex = OBJ_LIST_PLAYER;
-
-    BehaviorScript *bhvScript = segmented_to_virtual(o->behavior);
-    if ((bhvScript[0] >> 24) == 0) {
-        objListIndex = ((bhvScript[0] >> 16) & 0xFFFF);
-    }
-
-    if (objFlags & OBJ_FLAG_UCODE_SMALL) {
+    if ((objFlags & OBJ_FLAG_SILHOUETTE) || (objFlags & OBJ_FLAG_UCODE_SMALL)) {
         o->header.gfx.ucode = GRAPH_NODE_UCODE_REJ;
-    }
-    else {
+    } else {
         o->header.gfx.ucode = GRAPH_NODE_UCODE_DEFAULT;
     }
-
 #endif
+
 #ifdef OBJ_OPACITY_BY_CAM_DIST
     if (objFlags & OBJ_FLAG_OPACITY_FROM_CAMERA_DIST) {
         obj_set_opacity_from_cam_dist(o);
diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c
index 80818e308..6763218b7 100644
--- a/src/game/rendering_graph_node.c
+++ b/src/game/rendering_graph_node.c
@@ -248,7 +248,7 @@ void switch_ucode(s32 ucode) {
     switch (ucode) {
         default: // GRAPH_NODE_UCODE_DEFAULT
         case GRAPH_NODE_UCODE_DEFAULT:
-            gSPLoadUcodeL(gDisplayListHead++, gspF3DZEX2_PosLight_fifo); // F3DZEX2_PosLight
+            gSPLoadUcodeL(gDisplayListHead++, gspF3DZEX2_NoN_PosLight_fifo); // F3DZEX2_PosLight
             // Reload the necessary RSP settings
             gSPDisplayList(gDisplayListHead++, init_rsp);
             break;