diff --git a/build/ba8.vcxproj b/build/ba8.vcxproj
index 53c71cbc7..96cd2a854 100644
--- a/build/ba8.vcxproj
+++ b/build/ba8.vcxproj
@@ -69,14 +69,13 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -129,9 +128,9 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/f90.vcxproj b/build/f90.vcxproj
index e0bf92062..50f9d289a 100644
--- a/build/f90.vcxproj
+++ b/build/f90.vcxproj
@@ -116,7 +116,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\xvtdb\;..\src\cg;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\xvtdb\;..\src\cg;..\src\include;..\src\xvaga;..\src\f1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -232,6 +232,7 @@
     </SqlCompiler>
     <SqlCompiler Include="..\src\f9\sql\f90104.sql">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </SqlCompiler>
   </ItemGroup>
   <ItemGroup>
diff --git a/cd/test/ba0972.txt b/cd/test/ba0972.txt
new file mode 100644
index 000000000..fedcfcb7d
--- /dev/null
+++ b/cd/test/ba0972.txt
@@ -0,0 +1 @@
+ba8.exe
diff --git a/cd/test/ba0972a.ini b/cd/test/ba0972a.ini
new file mode 100644
index 000000000..d68b1a1b9
--- /dev/null
+++ b/cd/test/ba0972a.ini
@@ -0,0 +1,31 @@
+[Main]
+Demo=0
+
+[ba8]
+File(503) = ba8.exe|X
+Patch = 0972
+Versione = 21511200
+
+[ba99]
+Kill(0) = batbsce.txt|x
+Kill(1) = wxmsw240.dll|x
+Kill(2) = bastcms.rep|x
+Kill(3) = bastcms.msk|x
+Kill(4) = bastfsc.msk|x
+Kill(5) = bastfsc.rep|x
+Kill(6) = bastuue.msk|x
+Kill(7) = bastuue.rep|x
+
+[ba]
+Data = 23-06-2020
+Descrizione = Base
+Dischi = 1
+Moduli = sy
+OEM = 
+Patch = 972
+PostProcess = bainst -0 BA
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/ba0972a1.zip b/cd/test/ba0972a1.zip
new file mode 100644
index 000000000..dd8bda5a8
Binary files /dev/null and b/cd/test/ba0972a1.zip differ
diff --git a/cd/test/f90968.txt b/cd/test/f90968.txt
index f36df247d..3a96398e1 100644
--- a/cd/test/f90968.txt
+++ b/cd/test/f90968.txt
@@ -1,12 +1,12 @@
-f90200a.msk
 f90.exe
 f90100a.msk
-f90100d.msk
-fpmenu.men
 f90100b.msk
 f90100c.msk
+f90100d.msk
+f90200a.msk
 f90300a.msk
 f90300b.msk
+fpmenu.men
 f9prospintegr.rep
 sql\f90\f90104.sql
 
diff --git a/cd/test/f90968a.ini b/cd/test/f90968a.ini
index 6cbadd6b9..a02ed624d 100644
--- a/cd/test/f90968a.ini
+++ b/cd/test/f90968a.ini
@@ -3,21 +3,21 @@ Demo=0
 
 [f90]
 File(0) = f90.exe|X
-File(1) = f90100a.msk|X
-File(2) = f90100b.msk|X
-File(3) = f90100c.msk|X
-File(4) = f90100d.msk|X
-File(5) = fpmenu.men|X
-File(9) = f90200a.msk|X
-File(10) = f90300a.msk|X
-File(11) = f90300b.msk|X
-File(12) = f9prospintegr.rep|X
+File(2) = f90100a.msk|X
+File(3) = f90100b.msk|X
+File(4) = f90100c.msk|X
+File(5) = f90100d.msk|X
+File(6) = f90200a.msk|X
+File(7) = f90300a.msk|X
+File(8) = f90300b.msk|X
+File(9) = f9prospintegr.rep|X
+File(10) = fpmenu.men|X
 File(13) = sql\f90\f90104.sql|X
-Patch = 0968
+Patch = 968
 Versione = 21511200
 
 [f9]
-Data = 17-06-2020
+Data = 23-06-2020
 Descrizione = Archiviazione Sostitutiva
 Dischi = 1
 Moduli = fp,cg
diff --git a/cd/test/f90968a1.zip b/cd/test/f90968a1.zip
index 39f3b2784..381ac7336 100644
Binary files a/cd/test/f90968a1.zip and b/cd/test/f90968a1.zip differ