diff --git a/goal_src/jak3/engine/gfx/ocean/ocean-mid.gc b/goal_src/jak3/engine/gfx/ocean/ocean-mid.gc
index 21820e3cdc..5237ad4108 100644
--- a/goal_src/jak3/engine/gfx/ocean/ocean-mid.gc
+++ b/goal_src/jak3/engine/gfx/ocean/ocean-mid.gc
@@ -1001,7 +1001,8 @@
           (while (>= s1-0 s2-0)
             (set! (-> sv-36 x) (+ 196608.0 (* 393216.0 (the float s2-0)) (-> this start-corner x)))
             (set! (-> sv-36 z) (+ 196608.0 (* 393216.0 (the float s4-0)) (-> this start-corner z)))
-            (when (sphere-cull sv-36)
+            ;; og:preserve-this
+            (when (sphere-cull-for-ocean sv-36)
               (cond
                 ((= s4-0 sv-34)
                  (ocean-mid-add-upload-top this arg0 s4-0 s2-0)
diff --git a/goal_src/jak3/engine/gfx/ocean/ocean-transition.gc b/goal_src/jak3/engine/gfx/ocean/ocean-transition.gc
index 38418019d5..4427eec3de 100644
--- a/goal_src/jak3/engine/gfx/ocean/ocean-transition.gc
+++ b/goal_src/jak3/engine/gfx/ocean/ocean-transition.gc
@@ -652,7 +652,8 @@
             (while (>= s1-0 s2-0)
               (set! (-> sv-36 x) (+ 49152.0 (* 98304.0 (the float s2-0)) (-> this start-corner x)))
               (set! (-> sv-36 z) (+ 49152.0 (* 98304.0 (the float s4-0)) (-> this start-corner z)))
-              (when (sphere-cull sv-36)
+              ;; og:preserve-this
+              (when (sphere-cull-for-ocean sv-36)
                 (if (not (ocean-trans-camera-masks-bit? this s4-0 s2-0))
                     (ocean-trans-add-upload this arg0 s4-0 s2-0)
                     )
diff --git a/goal_src/jak3/engine/target/gun/gun-red-shot.gc b/goal_src/jak3/engine/target/gun/gun-red-shot.gc
index 163b45fc5c..c7c8e02552 100644
--- a/goal_src/jak3/engine/target/gun/gun-red-shot.gc
+++ b/goal_src/jak3/engine/target/gun/gun-red-shot.gc
@@ -588,6 +588,8 @@
                 (when s3-1
                   (when (and (!= *target* s3-1)
                              (not (focus-test? (the-as process-focusable s3-1) disable dead inactive))
+                             ;; og:preserve-this
+                             (pc-check-focus-fix s3-1)
                              (or (logtest? (process-mask crate enemy vehicle civilian) (-> s3-1 mask))
                                  (and (logtest? (process-mask guard) (-> s3-1 mask)) (-> *setting-control* user-current gun-target-guards?))
                                  )
@@ -1584,6 +1586,8 @@
                         (when s1-1
                           (when (and (!= *target* s1-1)
                                      (not (focus-test? (the-as process-focusable s1-1) disable dead inactive gun-no-target))
+                                     ;; og:preserve-this
+                                     (pc-check-focus-fix s1-1)
                                      (or (logtest? (process-mask crate enemy vehicle civilian) (-> s1-1 mask))
                                          (and (logtest? (process-mask guard) (-> s1-1 mask)) (-> *setting-control* user-current gun-target-guards?))
                                          )
diff --git a/goal_src/jak3/levels/wascity/flee-info.gc b/goal_src/jak3/levels/wascity/flee-info.gc
index d4da0d06f6..e2cb865cd6 100644
--- a/goal_src/jak3/levels/wascity/flee-info.gc
+++ b/goal_src/jak3/levels/wascity/flee-info.gc
@@ -42,7 +42,8 @@
             (+! sv-32 1)
             )
           )
-        (set! arg4 (+ s0-0 (the float (/ (the int f30-0) s1-0))))
+        ;; og:preserve-this fix divide by zero
+        (set! arg4 (+ s0-0 (the float (/-signed-0-guard (the int f30-0) s1-0))))
         )
       )
     )