diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml
index 067ed2e59d..9b78eed7fe 100644
--- a/assets/xml/objects/object_bg.xml
+++ b/assets/xml/objects/object_bg.xml
@@ -22,16 +22,16 @@
         <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
 
         <!-- Bombchu Bowling Girl limbs -->
-        <Limb Name="gChuGirlWaistLimb" Type="Standard" Offset="0x6E10"/>
-        <Limb Name="gChuGirlTorsoLimb" Type="Standard" Offset="0x6E1C"/>
-        <Limb Name="gChuGirlNeckLimb" Type="Standard" Offset="0x6E28"/>
-        <Limb Name="gChuGirlHeadLimb" Type="Standard" Offset="0x6E34"/>
-        <Limb Name="gChuGirlLeftUpperArmLimb" Type="Standard" Offset="0x6E40"/>
-        <Limb Name="gChuGirlLeftForearmLimb" Type="Standard" Offset="0x6E4C"/>
-        <Limb Name="gChuGirlLeftHandLimb" Type="Standard" Offset="0x6E58"/>
-        <Limb Name="gChuGirlRightUpperArmLimb" Type="Standard" Offset="0x6E64"/>
-        <Limb Name="gChuGirlRightForearmLimb" Type="Standard" Offset="0x6E70"/>
-        <Limb Name="gChuGirlRightHandLimb" Type="Standard" Offset="0x6E7C"/>
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
 
         <!-- Bombchu Bowling Girl limb textures -->
         <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgb5a1" Width="32" Height="32" Offset="0x5910"/>
diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml
index b4e5301d94..6dbc2b2413 100644
--- a/assets/xml/objects/object_dekunuts.xml
+++ b/assets/xml/objects/object_dekunuts.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_dekunuts" Segment="6">
         <!-- Deku Scrub skeleton -->
-        <Skeleton Name="gDekuNutsSkel" Type="Standard" LimbType="Standard" Offset="0x3268"/>
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
         
         <!-- Deku Scrub animations -->
         <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml
index 6b44b7a824..8d903af86d 100644
--- a/assets/xml/objects/object_dnk.xml
+++ b/assets/xml/objects/object_dnk.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_dnk" Segment="6">
         <!-- Forest Stage scrub skeleton -->
-        <Skeleton Name="gDntStageSkel" Type="Standard" LimbType="Standard" Offset="0x2AF0"/>
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
         
         <!-- Forest Stage scrub animations -->
         <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml
index 08150a4b43..b0d821e5af 100644
--- a/assets/xml/objects/object_dns.xml
+++ b/assets/xml/objects/object_dns.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_dns" Segment="6">
         <!-- Forest Stage leader skeleton -->
-        <Skeleton Name="gDntJijiSkel" Type="Standard" LimbType="Standard" Offset="0x33E0"/>
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
 
         <!-- Forest Stage leader animations -->
         <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml
index 263441b9a1..e114e1a16d 100644
--- a/assets/xml/objects/object_dodongo.xml
+++ b/assets/xml/objects/object_dodongo.xml
@@ -27,7 +27,7 @@
         <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgb5a1" Width="8" Height="8" Offset="0x80B8"/>
 
         <!-- Dodongo Skeleton -->
-        <Skeleton Name="gDodongoSkel" Type="Standard" LimbType="Standard" Offset="0x8318"/>
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
 
         <!-- Fire Effect Textures -->
         <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
diff --git a/assets/xml/objects/object_firefly.xml b/assets/xml/objects/object_firefly.xml
index 0876ce0f5e..6785a5396b 100644
--- a/assets/xml/objects/object_firefly.xml
+++ b/assets/xml/objects/object_firefly.xml
@@ -2,7 +2,7 @@
     <File Name="object_firefly" Segment="6">
         <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
 
-        <Skeleton Name="gKeeseSkeleton" Type="Standard" LimbType="Standard" Offset="0x18B8"/>
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
 
         <DList Name="gKeeseEyesDL" Offset="0x1678"/>
 
diff --git a/assets/xml/objects/object_hintnuts.xml b/assets/xml/objects/object_hintnuts.xml
index a3a0f28219..f419f7546a 100644
--- a/assets/xml/objects/object_hintnuts.xml
+++ b/assets/xml/objects/object_hintnuts.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_hintnuts" Segment="6">
         <!-- Deku scrub skeleton -->
-        <Skeleton Name="gHintNutsSkel" Type="Standard" LimbType="Standard" Offset="0x23B8"/>
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
         
         <!-- Deku Scrub animations -->
         <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
diff --git a/assets/xml/objects/object_okuta.xml b/assets/xml/objects/object_okuta.xml
index c33f1cc9df..a292f4a124 100644
--- a/assets/xml/objects/object_okuta.xml
+++ b/assets/xml/objects/object_okuta.xml
@@ -20,7 +20,7 @@
         <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgb5a1" Width="8" Height="8" Offset="0x30D0"/>
 
         <!-- Octorok Skeleton -->
-        <Skeleton Name="gOctorokSkel" Offset="0x3660"/>
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
 
         <!-- Projectile -->
         <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgb5a1" Width="16" Height="16" Offset="0x3150"/>
diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml
index fd708a625d..ca79023238 100644
--- a/assets/xml/objects/object_sk2.xml
+++ b/assets/xml/objects/object_sk2.xml
@@ -24,11 +24,11 @@
         <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
         <DList Name="gStalfosLeftFistDL" Offset="0x6988"/>
         <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
-        <Limb Name="gStalfosLimb0" Type="Standard" Offset="0x7868"/>
-        <Limb Name="gStalfosLimb1" Type="Standard" Offset="0x7874"/>
-        <Limb Name="gStalfosJawLimb" Type="Standard" Offset="0x78D4"/>
-        <Limb Name="gStalfosHeadLimb" Type="Standard" Offset="0x78E0"/>
-        <Limb Name="gStalfosEntryFirstVertebLimb" Type="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLimb0" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosLimb1" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosHeadLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosEntryFirstVertebLimb" LimbType="Standard" Offset="0x78EC"/>
         <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
         <Animation Name="gStalfosBackDamageAnim" Offset="0x444"/>
         <Animation Name="gStalfosBackDownAnim" Offset="0x1420"/>
diff --git a/assets/xml/overlays/ovl_Magic_Dark.xml b/assets/xml/overlays/ovl_Magic_Dark.xml
index f1ab218433..342a4641bb 100644
--- a/assets/xml/overlays/ovl_Magic_Dark.xml
+++ b/assets/xml/overlays/ovl_Magic_Dark.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="ovl_Magic_Dark" BaseOffset="0x80B873D0" RangeStart="0xD10" RangeEnd="0x1740">
-        <Symbol Name="gEffUnknown10Tex" Offset="0x04032490"/>
+        <!--Symbol Name="gEffUnknown10Tex" Offset="0x04032490"/-->
         <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xD10"/>
         <!--<DList Name="sDiamondTexDL" Offset="0x1650"/>
         <DList Name="sDiamondVertsDL" Offset="0x1700"/>-->
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index 4d98505b21..e4b575a900 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -329,9 +329,9 @@ void EnArrow_Fly(EnArrow* this, GlobalContext* globalCtx) {
         Math_Vec3f_Copy(&this->unk_210, &this->actor.world.pos);
         Actor_MoveForward(&this->actor);
 
-        if (this->touchedPoly =
+        if ((this->touchedPoly =
                 BgCheck_ProjectileLineTest(&globalCtx->colCtx, &this->actor.prevPos, &this->actor.world.pos, &hitPoint,
-                                           &this->actor.wallPoly, true, true, true, true, &bgId)) {
+                                           &this->actor.wallPoly, true, true, true, true, &bgId))) {
             func_8002F9EC(globalCtx, &this->actor, this->actor.wallPoly, bgId, &hitPoint);
             Math_Vec3f_Copy(&posCopy, &this->actor.world.pos);
             Math_Vec3f_Copy(&this->actor.world.pos, &hitPoint);
diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c
index 17d6262b0e..eb8146beef 100644
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -233,7 +233,8 @@ void EnFr_Init(Actor* thisx, GlobalContext* globalCtx) {
         this->actor.destroy = NULL;
         this->actor.draw = NULL;
         this->actor.update = EnFr_UpdateIdle;
-        this->actor.flags = this->actor.flags &= ~0x11;
+        this->actor.flags &= ~0x11;
+        this->actor.flags &= ~0;
         Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_PROP);
         this->actor.textId = 0x40AC;
         this->actionFunc = EnFr_Idle;
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 733360bdf5..5d32f28910 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -618,7 +618,7 @@ void Select_Init(GameState* thisx) {
     }
     SREG(30) = 1;
 
-    this->staticSegment = GameState_Alloc(this, size, "../z_select.c", 1114);
+    this->staticSegment = GameState_Alloc(&this->state, size, "../z_select.c", 1114);
     DmaMgr_SendRequest1(this->staticSegment, _z_select_staticSegmentRomStart, size, "../z_select.c", 1115);
     gSaveContext.cutsceneIndex = 0x8000;
     gSaveContext.linkAge = 1;
diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c
index 7cf422cbed..486fe3b362 100644
--- a/src/overlays/gamestates/ovl_title/z_title.c
+++ b/src/overlays/gamestates/ovl_title/z_title.c
@@ -156,7 +156,7 @@ void Title_Main(GameState* thisx) {
 void Title_Destroy(GameState* thisx) {
     TitleContext* this = (TitleContext*)thisx;
 
-    Sram_InitSram(this, &this->sramCtx);
+    Sram_InitSram(&this->state, &this->sramCtx);
 }
 
 void Title_Init(GameState* thisx) {
diff --git a/tools/vtxdis.c b/tools/vtxdis.c
index 6650eec1d5..1ba6969635 100644
--- a/tools/vtxdis.c
+++ b/tools/vtxdis.c
@@ -36,7 +36,7 @@ const struct option cmdline_opts[] = {
 
 static uint32_t parse_int(const char *num){
     uint32_t ret = 0;
-    char outnum[20];
+    char outnum[21];
     if(strlen(num) > 2 && num[0] == '0' && (num[1] == 'x' || num[1] == 'X')) {
         strncpy(outnum, &num[2], 20);
         sscanf(outnum, "%"SCNx32, &ret);
diff --git a/tools/xmlcreate.py b/tools/xmlcreate.py
index a23c9ac57e..cb916cd200 100644
--- a/tools/xmlcreate.py
+++ b/tools/xmlcreate.py
@@ -39,7 +39,7 @@ def animation_to_xml(var_name,offset):
     return animation_xml.format(var_name,offset.lstrip('0'))
 
 def skeleton_to_xml(var_name,offset, type):
-    skel_type = "Flex" if "Flex" in type else "Standard"
+    skel_type = "Flex" if "Flex" in type else "Normal"
     limb_type = "Standard"
 
     return skeleton_xml.format(var_name, offset.lstrip('0'), skel_type, limb_type)