diff --git a/FinModelUtility/Fin/Fin Tests/Fin Tests.csproj b/FinModelUtility/Fin/Fin Tests/Fin Tests.csproj
index 57e6a8276..1e9fc7b38 100644
--- a/FinModelUtility/Fin/Fin Tests/Fin Tests.csproj
+++ b/FinModelUtility/Fin/Fin Tests/Fin Tests.csproj
@@ -4,7 +4,6 @@
false
fin
enable
- AnyCPU;x64
diff --git a/FinModelUtility/FinModelUtility.sln b/FinModelUtility/FinModelUtility.sln
index 4ca39c1b9..1f6eb5add 100644
--- a/FinModelUtility/FinModelUtility.sln
+++ b/FinModelUtility/FinModelUtility.sln
@@ -187,8 +187,8 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Debug|x64.Build.0 = Debug|Any CPU
+ {A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Debug|x64.ActiveCfg = Debug|x64
+ {A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Debug|x64.Build.0 = Debug|x64
{A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Debug|x86.ActiveCfg = Debug|Any CPU
{A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Debug|x86.Build.0 = Debug|Any CPU
{A0CFC24D-3C11-49F8-BF35-0ED04E82583F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -271,8 +271,8 @@ Global
{089C1412-5CCA-4E35-A3A9-13BB34071E8C}.Release|x86.Build.0 = Release|Any CPU
{9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Debug|x64.ActiveCfg = Debug|Any CPU
- {9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Debug|x64.Build.0 = Debug|Any CPU
+ {9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Debug|x64.ActiveCfg = Debug|x64
+ {9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Debug|x64.Build.0 = Debug|x64
{9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Debug|x86.ActiveCfg = Debug|Any CPU
{9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Debug|x86.Build.0 = Debug|Any CPU
{9DB5915B-9D2F-4AF0-871E-B5840023DF3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -319,8 +319,8 @@ Global
{77676319-66D9-4EAC-AD6E-CE05BBC49CCC}.Release|x86.Build.0 = Release|Any CPU
{78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Debug|x64.ActiveCfg = Debug|Any CPU
- {78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Debug|x64.Build.0 = Debug|Any CPU
+ {78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Debug|x64.ActiveCfg = Debug|x64
+ {78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Debug|x64.Build.0 = Debug|x64
{78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Debug|x86.ActiveCfg = Debug|Any CPU
{78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Debug|x86.Build.0 = Debug|Any CPU
{78881F67-0F9D-47E4-9FD3-DCDEC4E0BEEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -343,8 +343,8 @@ Global
{C0718D40-6D24-49F4-A30D-55B14078A0A1}.Release|x86.Build.0 = Release|Any CPU
{DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Debug|x64.Build.0 = Debug|Any CPU
+ {DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Debug|x64.ActiveCfg = Debug|x64
+ {DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Debug|x64.Build.0 = Debug|x64
{DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Debug|x86.ActiveCfg = Debug|Any CPU
{DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Debug|x86.Build.0 = Debug|Any CPU
{DE4EC779-18FF-44DB-94AE-1A38CD497EC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -367,8 +367,8 @@ Global
{7F57B864-05CB-4488-A798-0FC08D9F62B2}.Release|x86.Build.0 = Release|Any CPU
{288E57B9-4D50-42D9-89C7-51A730B0C46A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{288E57B9-4D50-42D9-89C7-51A730B0C46A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {288E57B9-4D50-42D9-89C7-51A730B0C46A}.Debug|x64.ActiveCfg = Debug|Any CPU
- {288E57B9-4D50-42D9-89C7-51A730B0C46A}.Debug|x64.Build.0 = Debug|Any CPU
+ {288E57B9-4D50-42D9-89C7-51A730B0C46A}.Debug|x64.ActiveCfg = Debug|x64
+ {288E57B9-4D50-42D9-89C7-51A730B0C46A}.Debug|x64.Build.0 = Debug|x64
{288E57B9-4D50-42D9-89C7-51A730B0C46A}.Debug|x86.ActiveCfg = Debug|Any CPU
{288E57B9-4D50-42D9-89C7-51A730B0C46A}.Debug|x86.Build.0 = Debug|Any CPU
{288E57B9-4D50-42D9-89C7-51A730B0C46A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -403,8 +403,8 @@ Global
{272EA254-6413-4CB0-9A7A-937167BEBE3A}.Release|x86.Build.0 = Release|Any CPU
{439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Debug|x64.Build.0 = Debug|Any CPU
+ {439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Debug|x64.ActiveCfg = Debug|x64
+ {439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Debug|x64.Build.0 = Debug|x64
{439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Debug|x86.ActiveCfg = Debug|Any CPU
{439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Debug|x86.Build.0 = Debug|Any CPU
{439E4AFB-51BD-4F54-B6FA-E20A06E29D6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -439,8 +439,8 @@ Global
{3071C4CC-A1CE-4211-9612-C366AA0CCE3D}.Release|x86.Build.0 = Release|Any CPU
{45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Debug|x64.ActiveCfg = Debug|Any CPU
- {45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Debug|x64.Build.0 = Debug|Any CPU
+ {45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Debug|x64.ActiveCfg = Debug|x64
+ {45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Debug|x64.Build.0 = Debug|x64
{45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Debug|x86.ActiveCfg = Debug|Any CPU
{45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Debug|x86.Build.0 = Debug|Any CPU
{45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -451,8 +451,8 @@ Global
{45DDB2A3-3AC0-43A9-AA11-F93FF020B218}.Release|x86.Build.0 = Release|Any CPU
{C606A58F-1C67-45A7-A61F-045F8DE9E665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C606A58F-1C67-45A7-A61F-045F8DE9E665}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C606A58F-1C67-45A7-A61F-045F8DE9E665}.Debug|x64.ActiveCfg = Debug|Any CPU
- {C606A58F-1C67-45A7-A61F-045F8DE9E665}.Debug|x64.Build.0 = Debug|Any CPU
+ {C606A58F-1C67-45A7-A61F-045F8DE9E665}.Debug|x64.ActiveCfg = Debug|x64
+ {C606A58F-1C67-45A7-A61F-045F8DE9E665}.Debug|x64.Build.0 = Debug|x64
{C606A58F-1C67-45A7-A61F-045F8DE9E665}.Debug|x86.ActiveCfg = Debug|Any CPU
{C606A58F-1C67-45A7-A61F-045F8DE9E665}.Debug|x86.Build.0 = Debug|Any CPU
{C606A58F-1C67-45A7-A61F-045F8DE9E665}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -559,8 +559,8 @@ Global
{0077C934-E53D-4881-83B6-011D2F080FB9}.Release|x86.Build.0 = Release|Any CPU
{5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Debug|x64.ActiveCfg = Debug|Any CPU
- {5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Debug|x64.Build.0 = Debug|Any CPU
+ {5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Debug|x64.ActiveCfg = Debug|x64
+ {5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Debug|x64.Build.0 = Debug|x64
{5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Debug|x86.ActiveCfg = Debug|Any CPU
{5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Debug|x86.Build.0 = Debug|Any CPU
{5F095A1B-B21B-4208-A87E-D72C3D3DBFFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -619,8 +619,8 @@ Global
{D56EF0D4-DE4A-43E7-8888-972CF9D278C6}.Release|x86.Build.0 = Release|Any CPU
{BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Debug|x64.Build.0 = Debug|Any CPU
+ {BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Debug|x64.ActiveCfg = Debug|x64
+ {BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Debug|x64.Build.0 = Debug|x64
{BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Debug|x86.ActiveCfg = Debug|Any CPU
{BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Debug|x86.Build.0 = Debug|Any CPU
{BCFEB85F-BAF2-4E49-BCC0-798308A3C37E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -685,10 +685,10 @@ Global
{39CA04AC-C886-4B46-9540-99451931E8D1}.Debug|x86.Build.0 = Debug|Any CPU
{39CA04AC-C886-4B46-9540-99451931E8D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39CA04AC-C886-4B46-9540-99451931E8D1}.Release|Any CPU.Build.0 = Release|Any CPU
- {39CA04AC-C886-4B46-9540-99451931E8D1}.Release|x64.ActiveCfg = Release|Any CPU
- {39CA04AC-C886-4B46-9540-99451931E8D1}.Release|x64.Build.0 = Release|Any CPU
- {39CA04AC-C886-4B46-9540-99451931E8D1}.Release|x86.ActiveCfg = Release|Any CPU
- {39CA04AC-C886-4B46-9540-99451931E8D1}.Release|x86.Build.0 = Release|Any CPU
+ {39CA04AC-C886-4B46-9540-99451931E8D1}.Release|x64.ActiveCfg = Release|x64
+ {39CA04AC-C886-4B46-9540-99451931E8D1}.Release|x64.Build.0 = Release|x64
+ {39CA04AC-C886-4B46-9540-99451931E8D1}.Release|x86.ActiveCfg = Release|x86
+ {39CA04AC-C886-4B46-9540-99451931E8D1}.Release|x86.Build.0 = Release|x86
{1C942FA4-F392-49C5-B329-6AF432FCCC59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C942FA4-F392-49C5-B329-6AF432FCCC59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C942FA4-F392-49C5-B329-6AF432FCCC59}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -703,8 +703,8 @@ Global
{1C942FA4-F392-49C5-B329-6AF432FCCC59}.Release|x86.Build.0 = Release|Any CPU
{E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Debug|x64.ActiveCfg = Debug|Any CPU
- {E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Debug|x64.Build.0 = Debug|Any CPU
+ {E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Debug|x64.ActiveCfg = Debug|x64
+ {E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Debug|x64.Build.0 = Debug|x64
{E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Debug|x86.ActiveCfg = Debug|Any CPU
{E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Debug|x86.Build.0 = Debug|Any CPU
{E1BD983C-3981-44FC-97B3-05C7ED0975FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/FinModelUtility/Formats/Dat/Dat Tests/Dat Tests.csproj b/FinModelUtility/Formats/Dat/Dat Tests/Dat Tests.csproj
index 70d4e50ce..fe4c0a3a9 100644
--- a/FinModelUtility/Formats/Dat/Dat Tests/Dat Tests.csproj
+++ b/FinModelUtility/Formats/Dat/Dat Tests/Dat Tests.csproj
@@ -8,7 +8,6 @@
dat
false
true
- AnyCPU;x64