diff --git a/libs/JSystem/src/JAudio2/JASSeqParser.cpp b/libs/JSystem/src/JAudio2/JASSeqParser.cpp
index 376ec22b4c..b2077ce499 100644
--- a/libs/JSystem/src/JAudio2/JASSeqParser.cpp
+++ b/libs/JSystem/src/JAudio2/JASSeqParser.cpp
@@ -813,9 +813,15 @@ s32 JASSeqParser::cmdDump(JASTrack* param_0, u32* param_1) {
 }
 
 s32 JASSeqParser::cmdPrintf(JASTrack* param_0, u32* param_1) {
+#if AVOID_UB
+    u8 stack_c[4] = {0};
+    u32 stack_10[4] = {0};
+    char buffer[128] = {0};
+#else
     u8 stack_c[4];
     u32 stack_10[4];
     char buffer[128];
+#endif
 
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     u32 r30 = 0;
diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc
index 1c02cb54f0..d595cd4293 100644
--- a/src/d/actor/d_a_alink_effect.inc
+++ b/src/d/actor/d_a_alink_effect.inc
@@ -1564,8 +1564,7 @@ void daAlink_c::setMetamorphoseEffectStartLink() {
     #endif
 
     #if TARGET_PC
-    static const Vec effWideScale = {mDoGph_gInf_c::getAspect(), 1.0f, 1.0f};
-    emitter->setGlobalParticleScale(effWideScale);
+    emitter->setGlobalParticleScale(mDoGph_gInf_c::getScale(), 1.0f);
     #endif
 }
 
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index b9262bab23..8644d433aa 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -821,12 +821,20 @@ static void dKy_FiveSenses_fullthrottle_dark_static1() {
             }
 
             if (kankyo->senses_ef_emitter1 != NULL) {
+                #if TARGET_PC
+                kankyo->senses_ef_emitter1->setGlobalParticleScale(mDoGph_gInf_c::getScale(), 1.0f);
+                #endif
+
                 kankyo->senses_ef_emitter1->setGlobalTranslation(particle_pos.x, particle_pos.y,
                                                                  particle_pos.z);
                 kankyo->senses_ef_emitter1->setGlobalAlpha(kankyo->senses_effect_strength * 255.0f);
             }
 
             if (kankyo->senses_ef_emitter2 != NULL) {
+                #if TARGET_PC
+                kankyo->senses_ef_emitter2->setGlobalParticleScale(mDoGph_gInf_c::getScale(), 1.0f);
+                #endif
+
                 kankyo->senses_ef_emitter2->setGlobalTranslation(particle_pos.x, particle_pos.y,
                                                                  particle_pos.z);
 
diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp
index dbfe11cf53..c23e6c3230 100644
--- a/src/d/d_meter_HIO.cpp
+++ b/src/d/d_meter_HIO.cpp
@@ -2293,7 +2293,10 @@ void dMeter_drawHIO_c::updateOnWide() {
 
     g_drawHIO.mMainHUDButtonsPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mMainHUDButtonsPosX);
     g_drawHIO.mRingHUDButtonsPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mRingHUDButtonsPosX);
+    g_drawHIO.mLightDrop.mVesselPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mLightDrop.mVesselPosX);
+    g_drawHIO.mLightDrop.mVesselTalkPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mLightDrop.mVesselTalkPosX);
     g_drawHIO.mRupeeKeyPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mRupeeKeyPosX);
+    g_drawHIO.mOxygenMeterPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mOxygenMeterPosX);
     g_drawHIO.mButtonCrossOFFPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mButtonCrossOFFPosX);
     g_drawHIO.mButtonCrossONPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mButtonCrossONPosX);
     g_drawHIO.mLifeGaugePosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mLifeGaugePosX);