diff --git a/src/DETHRACE/common/opponent.c b/src/DETHRACE/common/opponent.c
index 140da4ee..b4e98832 100644
--- a/src/DETHRACE/common/opponent.c
+++ b/src/DETHRACE/common/opponent.c
@@ -4032,32 +4032,31 @@ void WriteOutOppoPaths(void) {
         for (i = 0; 1; i++) {
 #ifdef DETHRACE_FIX_BUGS
             sprintf(str, "OPATH%03d.TXT", i);
-#else
-            sprintf(str, "OPATH%0.3d.TXT", i);
-#endif
             PathCat(the_path, gApplication_path, str);
-#ifdef DETHRACE_FIX_BUGS
             // OldDRfopen refuses to open unknown .TXT files
             f = fopen(the_path, "r");
 #else
+            sprintf(str, "OPATH%0.3d.TXT", i);
+            PathCat(the_path, gApplication_path, str);
             f = DRfopen(the_path, "r+");
 #endif
-            if (f == NULL) {
+            if (!f) {
+                strcpy(gOppo_path_filename, the_path);
+                gMade_path_filename = 1;
                 break;
             }
             fclose(f);
         }
-        strcpy(gOppo_path_filename, the_path);
-        gMade_path_filename = 1;
     }
 #ifdef DETHRACE_FIX_BUGS
     f = fopen(gOppo_path_filename, "w");
-#else
-    f = DRfopen(gOppo_path_filename, "wt");
-#endif
     if (f == NULL) {
         printf("f is NULL, errno=%d, msg=\"%s\"\n", errno, strerror(errno));
     }
+#else
+    f = DRfopen(gOppo_path_filename, "wt");
+#endif
+
     fprintf(f, "%s\n", "START OF OPPONENT PATHS");
     fprintf(f, "\n%-3d                             // Number of path nodes\n",
         gProgram_state.AI_vehicles.number_of_path_nodes);
@@ -4091,7 +4090,7 @@ void WriteOutOppoPaths(void) {
             gProgram_state.AI_vehicles.cop_start_points[i].v[2],
             0.f, 0.f, 0.f, i);
     }
-    fprintf(f, "END OF OPPONENT PATHS");
+    fprintf(f, "\n%s\n", "END OF OPPONENT PATHS");
     fclose(f);
 }
 
@@ -4104,7 +4103,10 @@ int NewNodeOKHere(void) {
         BrVector3Sub(&last_node_to_this,
             &gProgram_state.AI_vehicles.path_nodes[gProgram_state.AI_vehicles.path_sections[gMobile_section].node_indices[1]].p,
             &gProgram_state.AI_vehicles.path_nodes[gProgram_state.AI_vehicles.path_sections[gMobile_section].node_indices[0]].p);
-        return BrVector3Length(&last_node_to_this) != 0.f;
+
+        if (BrVector3Length(&last_node_to_this) == 0.f) {
+            return 0;
+        }
     }
     return 1;
 }