diff --git a/src/SB/Core/x/xHudFontMeter.cpp b/src/SB/Core/x/xHudFontMeter.cpp
index e16a14a7e..824c7d9fe 100644
--- a/src/SB/Core/x/xHudFontMeter.cpp
+++ b/src/SB/Core/x/xHudFontMeter.cpp
@@ -13,7 +13,7 @@ void xhud::font_meter_widget::load(xBase& data, xDynAsset& asset, u32 size_t)
     //     xhud::font_meter_widget(*(xhud::font_meter_asset*)&data); // TODO: proper size value
 }
 
-xhud::font_meter_widget::font_meter_widget(xhud::font_meter_asset& init) : meter_widget(init)
+xhud::font_meter_widget::font_meter_widget(const xhud::font_meter_asset& init) : meter_widget(init)
 {
     basic_rect<F32> screen_bounds;
 
diff --git a/src/SB/Core/x/xHudFontMeter.h b/src/SB/Core/x/xHudFontMeter.h
index a851e82d5..22afa6490 100644
--- a/src/SB/Core/x/xHudFontMeter.h
+++ b/src/SB/Core/x/xHudFontMeter.h
@@ -41,7 +41,7 @@ namespace xhud
         xfont xf; // 0x128
 
         static void load(xBase& data, xDynAsset& asset, size_t);
-        font_meter_widget(xhud::font_meter_asset& init);
+        font_meter_widget(const xhud::font_meter_asset& init);
         void destruct();
         void destroy();
         U32 type();
diff --git a/src/SB/Game/zNPCHazard.cpp b/src/SB/Game/zNPCHazard.cpp
index c6674836f..4617c4bcb 100644
--- a/src/SB/Game/zNPCHazard.cpp
+++ b/src/SB/Game/zNPCHazard.cpp
@@ -1947,8 +1947,7 @@ void UVAModelInfo::Hemorrage()
     uv = 0;
 }
 
-// Need to figure out what is wrong with the final return statement, and the b and blr swaps.
-S32 UVAModelInfo::GetUV(RwTexCoords*& coords, S32& numVertices, RpAtomic* model)
+S32 UVAModelInfo::GetUV(RwTexCoords*& coords, S32& numVertices, RpAtomic* model) const
 {
     coords = NULL;
     numVertices = 0;
diff --git a/src/SB/Game/zNPCHazard.h b/src/SB/Game/zNPCHazard.h
index 10867353f..f6e685097 100644
--- a/src/SB/Game/zNPCHazard.h
+++ b/src/SB/Game/zNPCHazard.h
@@ -22,7 +22,7 @@ struct UVAModelInfo
     void Hemorrage();
     void Clear();
     void UVVelSet(float, float);
-    S32 GetUV(RwTexCoords*& coords, S32& numVertices, RpAtomic* model);
+    S32 GetUV(RwTexCoords*& coords, S32& numVertices, RpAtomic* model) const;
     void SetColor(iColor_tag);
     void Update(F32, xVec2*);
     S32 Valid();