diff --git a/asm/GuiSys/CGuiGroup.s b/asm/GuiSys/CGuiGroup.s
index 94cb9dcf..f2331abe 100644
--- a/asm/GuiSys/CGuiGroup.s
+++ b/asm/GuiSys/CGuiGroup.s
@@ -1025,7 +1025,7 @@ lbl_802C1EA0:
 /* 802C1EB4 002BEE14  48 00 0B C9 */	bl __dt__9CGuiFrameFv
 lbl_802C1EB8:
 /* 802C1EB8 002BEE18  38 61 00 08 */	addi r3, r1, 8
-/* 802C1EBC 002BEE1C  4B D7 24 49 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 802C1EBC 002BEE1C  4B D7 24 49 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 802C1EC0 002BEE20  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802C1EC4 002BEE24  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 802C1EC8 002BEE28  7C 08 03 A6 */	mtlr r0
diff --git a/asm/Kyoto/Animation/CAllFormatsAnimSource.s b/asm/Kyoto/Animation/CAllFormatsAnimSource.s
index 06906a2f..5783d126 100644
--- a/asm/Kyoto/Animation/CAllFormatsAnimSource.s
+++ b/asm/Kyoto/Animation/CAllFormatsAnimSource.s
@@ -257,7 +257,7 @@ lbl_802FE280:
 /* 802FE294 002FB1F4  4B FF FC 89 */	bl __dt__21CAllFormatsAnimSourceFv
 lbl_802FE298:
 /* 802FE298 002FB1F8  38 61 00 08 */	addi r3, r1, 8
-/* 802FE29C 002FB1FC  4B D3 60 69 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 802FE29C 002FB1FC  4B D3 60 69 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 802FE2A0 002FB200  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802FE2A4 002FB204  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 802FE2A8 002FB208  83 C1 00 28 */	lwz r30, 0x28(r1)
diff --git a/asm/Kyoto/CFactoryStore.s b/asm/Kyoto/CFactoryStore.s
index d82fccfa..2b4b8e59 100644
--- a/asm/Kyoto/CFactoryStore.s
+++ b/asm/Kyoto/CFactoryStore.s
@@ -10,8 +10,8 @@
 	.4byte 0
 	.4byte "__dt__31TObjOwnerParam<P12IObjectStore>Fv"
 
-.global lbl_803EE3E4
-lbl_803EE3E4:
+.global __vt__12IObjectStore
+__vt__12IObjectStore:
 	# ROM: 0x3EB3E4
 	.4byte 0
 	.4byte 0
diff --git a/asm/Kyoto/CObjectReference.s b/asm/Kyoto/CObjectReference.s
index 1fe10cff..227a790c 100644
--- a/asm/Kyoto/CObjectReference.s
+++ b/asm/Kyoto/CObjectReference.s
@@ -296,7 +296,7 @@ lbl_8033FEAC:
 /* 8033FEB4 0033CE14  34 1E 00 14 */	addic. r0, r30, 0x14
 /* 8033FEB8 0033CE18  41 82 00 0C */	beq lbl_8033FEC4
 /* 8033FEBC 0033CE1C  38 7E 00 14 */	addi r3, r30, 0x14
-/* 8033FEC0 0033CE20  4B CF 44 45 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 8033FEC0 0033CE20  4B CF 44 45 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 lbl_8033FEC4:
 /* 8033FEC4 0033CE24  7F E0 07 35 */	extsh. r0, r31
 /* 8033FEC8 0033CE28  40 81 00 0C */	ble lbl_8033FED4
@@ -341,7 +341,7 @@ lbl_8033FED4:
 /* 8033FF54 0033CEB4  80 85 00 04 */	lwz r4, 4(r5)
 /* 8033FF58 0033CEB8  38 04 00 01 */	addi r0, r4, 1
 /* 8033FF5C 0033CEBC  90 05 00 04 */	stw r0, 4(r5)
-/* 8033FF60 0033CEC0  4B CF 43 A5 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 8033FF60 0033CEC0  4B CF 43 A5 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 8033FF64 0033CEC4  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 8033FF68 0033CEC8  7F E3 FB 78 */	mr r3, r31
 /* 8033FF6C 0033CECC  83 E1 00 1C */	lwz r31, 0x1c(r1)
diff --git a/asm/Kyoto/CResFactory.s b/asm/Kyoto/CResFactory.s
index 00bc7eba..3d23f146 100644
--- a/asm/Kyoto/CResFactory.s
+++ b/asm/Kyoto/CResFactory.s
@@ -310,7 +310,7 @@ lbl_803398B4:
 /* 803398BC 0033681C  34 1E 00 34 */	addic. r0, r30, 0x34
 /* 803398C0 00336820  41 82 00 0C */	beq lbl_803398CC
 /* 803398C4 00336824  38 7E 00 34 */	addi r3, r30, 0x34
-/* 803398C8 00336828  4B CF AA 3D */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 803398C8 00336828  4B CF AA 3D */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 lbl_803398CC:
 /* 803398CC 0033682C  34 1E 00 24 */	addic. r0, r30, 0x24
 /* 803398D0 00336830  41 82 00 18 */	beq lbl_803398E8
diff --git a/asm/Kyoto/CSimplePool.s b/asm/Kyoto/CSimplePool.s
index 21d59df3..ae0b7986 100644
--- a/asm/Kyoto/CSimplePool.s
+++ b/asm/Kyoto/CSimplePool.s
@@ -531,7 +531,7 @@ lbl_803405DC:
 /* 803405DC 0033D53C  7F 40 07 75 */	extsb. r0, r26
 /* 803405E0 0033D540  41 82 00 0C */	beq lbl_803405EC
 /* 803405E4 0033D544  38 61 00 08 */	addi r3, r1, 8
-/* 803405E8 0033D548  4B CF 3D 1D */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 803405E8 0033D548  4B CF 3D 1D */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 lbl_803405EC:
 /* 803405EC 0033D54C  80 BE 00 00 */	lwz r5, 0(r30)
 /* 803405F0 0033D550  38 61 00 1C */	addi r3, r1, 0x1c
@@ -644,7 +644,7 @@ lbl_80340758:
 /* 80340760 0033D6C0  34 1E 00 1C */	addic. r0, r30, 0x1c
 /* 80340764 0033D6C4  41 82 00 0C */	beq lbl_80340770
 /* 80340768 0033D6C8  38 7E 00 1C */	addi r3, r30, 0x1c
-/* 8034076C 0033D6CC  4B CF 3B 99 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 8034076C 0033D6CC  4B CF 3B 99 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 lbl_80340770:
 /* 80340770 0033D6D0  34 1E 00 04 */	addic. r0, r30, 4
 /* 80340774 0033D6D4  41 82 00 34 */	beq lbl_803407A8
@@ -679,9 +679,9 @@ lbl_803407B8:
 __ct__11CSimplePoolFR8IFactory:
 /* 803407D4 0033D734  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 803407D8 0033D738  7C 08 02 A6 */	mflr r0
-/* 803407DC 0033D73C  3C A0 80 3F */	lis r5, lbl_803EE3E4@ha
+/* 803407DC 0033D73C  3C A0 80 3F */	lis r5, __vt__12IObjectStore@ha
 /* 803407E0 0033D740  90 01 00 24 */	stw r0, 0x24(r1)
-/* 803407E4 0033D744  38 05 E3 E4 */	addi r0, r5, lbl_803EE3E4@l
+/* 803407E4 0033D744  38 05 E3 E4 */	addi r0, r5, __vt__12IObjectStore@l
 /* 803407E8 0033D748  88 A1 00 08 */	lbz r5, 8(r1)
 /* 803407EC 0033D74C  93 E1 00 1C */	stw r31, 0x1c(r1)
 /* 803407F0 0033D750  7C 7F 1B 78 */	mr r31, r3
@@ -709,7 +709,7 @@ __ct__11CSimplePoolFR8IFactory:
 /* 80340848 0033D7A8  80 85 00 04 */	lwz r4, 4(r5)
 /* 8034084C 0033D7AC  38 04 00 01 */	addi r0, r4, 1
 /* 80340850 0033D7B0  90 05 00 04 */	stw r0, 4(r5)
-/* 80340854 0033D7B4  4B CF 3A B1 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 80340854 0033D7B4  4B CF 3A B1 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 80340858 0033D7B8  3C 80 80 3D */	lis r4, lbl_803D7A98@ha
 /* 8034085C 0033D7BC  38 60 00 08 */	li r3, 8
 /* 80340860 0033D7C0  38 84 7A 98 */	addi r4, r4, lbl_803D7A98@l
@@ -745,7 +745,7 @@ lbl_803408C4:
 /* 803408D0 0033D830  7C 00 18 40 */	cmplw r0, r3
 /* 803408D4 0033D834  41 82 00 24 */	beq lbl_803408F8
 /* 803408D8 0033D838  7C 83 23 78 */	mr r3, r4
-/* 803408DC 0033D83C  4B CF 3A 29 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 803408DC 0033D83C  4B CF 3A 29 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 803408E0 0033D840  80 01 00 10 */	lwz r0, 0x10(r1)
 /* 803408E4 0033D844  90 1F 00 1C */	stw r0, 0x1c(r31)
 /* 803408E8 0033D848  80 9F 00 1C */	lwz r4, 0x1c(r31)
@@ -754,7 +754,7 @@ lbl_803408C4:
 /* 803408F4 0033D854  90 04 00 04 */	stw r0, 4(r4)
 lbl_803408F8:
 /* 803408F8 0033D858  38 61 00 10 */	addi r3, r1, 0x10
-/* 803408FC 0033D85C  4B CF 3A 09 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 803408FC 0033D85C  4B CF 3A 09 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 80340900 0033D860  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 80340904 0033D864  7F E3 FB 78 */	mr r3, r31
 /* 80340908 0033D868  83 E1 00 1C */	lwz r31, 0x1c(r1)
diff --git a/asm/Kyoto/Graphics/DolphinCModel.s b/asm/Kyoto/Graphics/DolphinCModel.s
index 5004c08c..f4c65bff 100644
--- a/asm/Kyoto/Graphics/DolphinCModel.s
+++ b/asm/Kyoto/Graphics/DolphinCModel.s
@@ -556,7 +556,7 @@ lbl_803557C4:
 /* 803557D8 00352738  48 00 04 79 */	bl __dt__6CModelFv
 lbl_803557DC:
 /* 803557DC 0035273C  38 61 00 08 */	addi r3, r1, 8
-/* 803557E0 00352740  4B CD EB 25 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 803557E0 00352740  4B CD EB 25 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 803557E4 00352744  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 803557E8 00352748  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 803557EC 0035274C  83 C1 00 28 */	lwz r30, 0x28(r1)
diff --git a/asm/Kyoto/Particles/CParticleDataFactory.s b/asm/Kyoto/Particles/CParticleDataFactory.s
index a3e75bca..3d6f976a 100644
--- a/asm/Kyoto/Particles/CParticleDataFactory.s
+++ b/asm/Kyoto/Particles/CParticleDataFactory.s
@@ -6266,7 +6266,7 @@ lbl_8032A0B8:
 /* 8032A0CC 0032702C  48 03 CD 6D */	bl __dt__15CGenDescriptionFv
 lbl_8032A0D0:
 /* 8032A0D0 00327030  38 61 00 08 */	addi r3, r1, 8
-/* 8032A0D4 00327034  4B D0 A2 31 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 8032A0D4 00327034  4B D0 A2 31 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 8032A0D8 00327038  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 8032A0DC 0032703C  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 8032A0E0 00327040  7C 08 03 A6 */	mtlr r0
diff --git a/asm/Kyoto/Particles/CParticleElectricDataFactory.s b/asm/Kyoto/Particles/CParticleElectricDataFactory.s
index ffff478a..37c2befc 100644
--- a/asm/Kyoto/Particles/CParticleElectricDataFactory.s
+++ b/asm/Kyoto/Particles/CParticleElectricDataFactory.s
@@ -660,7 +660,7 @@ lbl_8035E7DC:
 /* 8035E7F0 0035B750  48 00 7F C9 */	bl __dt__20CElectricDescriptionFv
 lbl_8035E7F4:
 /* 8035E7F4 0035B754  38 61 00 08 */	addi r3, r1, 8
-/* 8035E7F8 0035B758  4B CD 5B 0D */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 8035E7F8 0035B758  4B CD 5B 0D */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 8035E7FC 0035B75C  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 8035E800 0035B760  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 8035E804 0035B764  7C 08 03 A6 */	mtlr r0
diff --git a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s
index c2e6e79b..22c86f82 100644
--- a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s
+++ b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s
@@ -549,7 +549,7 @@ lbl_80330088:
 /* 8033009C 0032CFFC  48 03 6A 5D */	bl __dt__18CSwooshDescriptionFv
 lbl_803300A0:
 /* 803300A0 0032D000  38 61 00 08 */	addi r3, r1, 8
-/* 803300A4 0032D004  4B D0 42 61 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 803300A4 0032D004  4B D0 42 61 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 803300A8 0032D008  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 803300AC 0032D00C  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 803300B0 0032D010  7C 08 03 A6 */	mtlr r0
diff --git a/asm/Kyoto/Text/CRasterFont.s b/asm/Kyoto/Text/CRasterFont.s
index 5da0b28f..0843f8ec 100644
--- a/asm/Kyoto/Text/CRasterFont.s
+++ b/asm/Kyoto/Text/CRasterFont.s
@@ -161,7 +161,7 @@ lbl_803000EC:
 /* 803000EC 002FD04C  7F A3 EB 78 */	mr r3, r29
 /* 803000F0 002FD050  48 00 00 29 */	bl sub_80300118
 /* 803000F4 002FD054  38 61 00 08 */	addi r3, r1, 8
-/* 803000F8 002FD058  4B D3 42 0D */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 803000F8 002FD058  4B D3 42 0D */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 803000FC 002FD05C  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 80300100 002FD060  83 E1 00 1C */	lwz r31, 0x1c(r1)
 /* 80300104 002FD064  83 C1 00 18 */	lwz r30, 0x18(r1)
diff --git a/asm/MetroidPrime/Factories/CAssetFactory.s b/asm/MetroidPrime/Factories/CAssetFactory.s
index 046e07ec..eb129d47 100644
--- a/asm/MetroidPrime/Factories/CAssetFactory.s
+++ b/asm/MetroidPrime/Factories/CAssetFactory.s
@@ -97,7 +97,7 @@ GetFactory__24CCharacterFactoryBuilderFRC8CAnimRes:
 /* 80034928 00031888  38 80 FF FF */	li r4, -1
 /* 8003492C 0003188C  48 30 C5 15 */	bl __dt__6CTokenFv
 /* 80034930 00031890  38 61 00 08 */	addi r3, r1, 8
-/* 80034934 00031894  4B FF F9 D1 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 80034934 00031894  4B FF F9 D1 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 80034938 00031898  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 8003493C 0003189C  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 80034940 000318A0  83 C1 00 28 */	lwz r30, 0x28(r1)
diff --git a/asm/MetroidPrime/Factories/CCharacterFactory.s b/asm/MetroidPrime/Factories/CCharacterFactory.s
index 0d3461f6..044afb9a 100644
--- a/asm/MetroidPrime/Factories/CCharacterFactory.s
+++ b/asm/MetroidPrime/Factories/CCharacterFactory.s
@@ -866,7 +866,7 @@ lbl_80032404:
 /* 80032438 0002F398  38 80 FF FF */	li r4, -1
 /* 8003243C 0002F39C  48 30 EA 05 */	bl __dt__6CTokenFv
 /* 80032440 0002F3A0  38 61 00 24 */	addi r3, r1, 0x24
-/* 80032444 0002F3A4  48 00 1E C1 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 80032444 0002F3A4  48 00 1E C1 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 80032448 0002F3A8  80 9E 00 A8 */	lwz r4, 0xa8(r30)
 /* 8003244C 0002F3AC  38 60 00 01 */	li r3, 1
 /* 80032450 0002F3B0  80 BE 00 AC */	lwz r5, 0xac(r30)
@@ -954,7 +954,7 @@ lbl_80032574:
 /* 80032584 0002F4E4  38 80 FF FF */	li r4, -1
 /* 80032588 0002F4E8  48 30 E8 B9 */	bl __dt__6CTokenFv
 /* 8003258C 0002F4EC  38 61 00 20 */	addi r3, r1, 0x20
-/* 80032590 0002F4F0  48 00 1D 75 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 80032590 0002F4F0  48 00 1D 75 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 lbl_80032594:
 /* 80032594 0002F4F4  3C 60 80 3D */	lis r3, lbl_803CCD78@ha
 /* 80032598 0002F4F8  3A E0 00 00 */	li r23, 0
@@ -2410,7 +2410,7 @@ lbl_800339DC:
 /* 800339EC 0003094C  48 30 D4 55 */	bl __dt__6CTokenFv
 lbl_800339F0:
 /* 800339F0 00030950  38 61 00 08 */	addi r3, r1, 8
-/* 800339F4 00030954  48 00 09 11 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 800339F4 00030954  48 00 09 11 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 800339F8 00030958  48 00 02 5C */	b lbl_80033C54
 lbl_800339FC:
 /* 800339FC 0003095C  3C 60 80 3D */	lis r3, lbl_803CCD78@ha
@@ -2565,14 +2565,14 @@ lbl_80033C20:
 /* 80033C30 00030B90  48 30 D2 11 */	bl __dt__6CTokenFv
 lbl_80033C34:
 /* 80033C34 00030B94  38 61 00 08 */	addi r3, r1, 8
-/* 80033C38 00030B98  48 00 06 CD */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 80033C38 00030B98  48 00 06 CD */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 80033C3C 00030B9C  48 00 00 18 */	b lbl_80033C54
 lbl_80033C40:
 /* 80033C40 00030BA0  38 00 00 00 */	li r0, 0
 /* 80033C44 00030BA4  38 61 00 08 */	addi r3, r1, 8
 /* 80033C48 00030BA8  98 1D 00 00 */	stb r0, 0(r29)
 /* 80033C4C 00030BAC  90 1D 00 04 */	stw r0, 4(r29)
-/* 80033C50 00030BB0  48 00 06 B5 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 80033C50 00030BB0  48 00 06 B5 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 lbl_80033C54:
 /* 80033C54 00030BB4  BA C1 01 18 */	lmw r22, 0x118(r1)
 /* 80033C58 00030BB8  80 01 01 44 */	lwz r0, 0x144(r1)
@@ -3064,8 +3064,8 @@ lbl_800342F0:
 /* 800342FC 0003125C  38 21 00 10 */	addi r1, r1, 0x10
 /* 80034300 00031260  4E 80 00 20 */	blr
 
-.global "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
-"ReleaseData__Q24rstl10rc_ptr<Pv>Fv":
+.global "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
+"ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv":
 /* 80034304 00031264  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 80034308 00031268  7C 08 02 A6 */	mflr r0
 /* 8003430C 0003126C  90 01 00 14 */	stw r0, 0x14(r1)
diff --git a/asm/Weapons/CCollisionResponseData.s b/asm/Weapons/CCollisionResponseData.s
index 8c8cca62..59cdba00 100644
--- a/asm/Weapons/CCollisionResponseData.s
+++ b/asm/Weapons/CCollisionResponseData.s
@@ -79,7 +79,7 @@ lbl_802B2230:
 /* 802B2244 002AF1A4  48 00 04 BD */	bl sub_802b2700
 lbl_802B2248:
 /* 802B2248 002AF1A8  38 61 00 08 */	addi r3, r1, 8
-/* 802B224C 002AF1AC  4B D8 20 B9 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 802B224C 002AF1AC  4B D8 20 B9 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 802B2250 002AF1B0  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802B2254 002AF1B4  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 802B2258 002AF1B8  83 C1 00 28 */	lwz r30, 0x28(r1)
diff --git a/asm/Weapons/CDecalDataFactory.s b/asm/Weapons/CDecalDataFactory.s
index 33eaef3f..fc55f914 100644
--- a/asm/Weapons/CDecalDataFactory.s
+++ b/asm/Weapons/CDecalDataFactory.s
@@ -1140,7 +1140,7 @@ FDecalDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
 /* 802B4624 002B1584  7C 04 03 78 */	mr r4, r0
 /* 802B4628 002B1588  48 00 00 21 */	bl "__ct__Q24rstl29auto_ptr<17CDecalDescription>FP17CDecalDescription"
 /* 802B462C 002B158C  38 61 00 08 */	addi r3, r1, 8
-/* 802B4630 002B1590  4B D7 FC D5 */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 802B4630 002B1590  4B D7 FC D5 */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 802B4634 002B1594  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 802B4638 002B1598  83 E1 00 1C */	lwz r31, 0x1c(r1)
 /* 802B463C 002B159C  7C 08 03 A6 */	mtlr r0
diff --git a/asm/Weapons/CProjectileWeaponDataFactory.s b/asm/Weapons/CProjectileWeaponDataFactory.s
index e0b50e90..e75025b5 100644
--- a/asm/Weapons/CProjectileWeaponDataFactory.s
+++ b/asm/Weapons/CProjectileWeaponDataFactory.s
@@ -1109,7 +1109,7 @@ lbl_802B205C:
 /* 802B2070 002AEFD0  48 00 38 31 */	bl __dt__18CWeaponDescriptionFv
 lbl_802B2074:
 /* 802B2074 002AEFD4  38 61 00 08 */	addi r3, r1, 8
-/* 802B2078 002AEFD8  4B D8 22 8D */	bl "ReleaseData__Q24rstl10rc_ptr<Pv>Fv"
+/* 802B2078 002AEFD8  4B D8 22 8D */	bl "ReleaseData__Q24rstl20rc_ptr<10IVParamObj>Fv"
 /* 802B207C 002AEFDC  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802B2080 002AEFE0  83 E1 00 2C */	lwz r31, 0x2c(r1)
 /* 802B2084 002AEFE4  7C 08 03 A6 */	mtlr r0
diff --git a/include/Kyoto/CVParamTransfer.hpp b/include/Kyoto/CVParamTransfer.hpp
index bd302708..c2fe048d 100644
--- a/include/Kyoto/CVParamTransfer.hpp
+++ b/include/Kyoto/CVParamTransfer.hpp
@@ -17,6 +17,7 @@ private:
 
 class CVParamTransfer {
 public:
+  CVParamTransfer() {}
   template < typename T >
   CVParamTransfer(TObjOwnerParam< T >* obj) : x0_obj(obj) {}
   static CVParamTransfer Null();
diff --git a/src/Kyoto/CFactoryStore.cpp b/src/Kyoto/CFactoryStore.cpp
index 6899f5d4..3a8aca20 100644
--- a/src/Kyoto/CFactoryStore.cpp
+++ b/src/Kyoto/CFactoryStore.cpp
@@ -1,5 +1,3 @@
 #include "Kyoto/IObjectStore.hpp"
 #include "Kyoto/Alloc/CMemory.hpp"
 #include "Kyoto/CObjectReference.hpp"
-
-TObjOwnerParam<IObjectStore*> tmp;