diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index c7ea06fd51..6e43f2fb30 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -41,8 +41,6 @@ void SkelAnime_DrawLimbLod(PlayState* play, s32 limbIndex, void** skeleton, Vec3
         }
     }
 
-    if (1) {}
-
     if (postLimbDraw != NULL) {
         postLimbDraw(play, limbIndex, &dList, &rot, arg);
     }
@@ -261,8 +259,6 @@ void SkelAnime_DrawLimbOpa(PlayState* play, s32 limbIndex, void** skeleton, Vec3
         }
     }
 
-    if (1) {}
-
     if (postLimbDraw != NULL) {
         postLimbDraw(play, limbIndex, &dList, &rot, arg);
     }
@@ -855,9 +851,14 @@ AnimTask* AnimTaskQueue_NewTask(AnimTaskQueue* animTaskQueue, s32 type) {
     return task;
 }
 
+#if PLATFORM_N64
+#define LINK_ANIMATION_OFFSET(addr, offset) \
+    (((uintptr_t)_link_animetionSegmentRomStart) + SEGMENT_OFFSET(addr) + (offset))
+#else
 #define LINK_ANIMATION_OFFSET(addr, offset)                                                                         \
     (((uintptr_t)_link_animetionSegmentRomStart) + ((uintptr_t)(addr)) - ((uintptr_t)_link_animetionSegmentStart) + \
      (offset))
+#endif
 
 /**
  * Creates a task which will load a single frame of animation data from the link_animetion file.
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 850979368d..31563b959a 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -142,8 +142,8 @@ void View_GetViewport(View* view, Viewport* viewport) {
 
 void View_ApplyLetterbox(View* view) {
     GraphicsContext* gfxCtx = view->gfxCtx;
-    s32 letterboxSize;
     s32 pillarboxSize;
+    s32 letterboxSize;
     s32 ulx;
     s32 uly;
     s32 lrx;
@@ -400,9 +400,9 @@ s32 View_ApplyPerspective(View* view) {
 }
 
 s32 View_ApplyOrtho(View* view) {
+    GraphicsContext* gfxCtx = view->gfxCtx;
     Vp* vp;
     Mtx* projection;
-    GraphicsContext* gfxCtx = view->gfxCtx;
 
     OPEN_DISPS(gfxCtx, "../z_view.c", 726);
 
diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c
index 3e9f15eb52..5a542bc124 100644
--- a/src/code/z_viszbuf.c
+++ b/src/code/z_viszbuf.c
@@ -66,6 +66,7 @@ void VisZBuf_Destroy(VisZBuf* this) {
 
 void VisZBuf_Draw(VisZBuf* this, Gfx** gfxP) {
     Gfx* gfx = *gfxP;
+    s32 pad;
     u16* zbufFrag = D_0E000000;
     s32 fmt;
     s32 y;