diff --git a/tools/itscertgen/cxml/cxml.vcxproj b/tools/itscertgen/cxml/cxml.vcxproj
index abddf8fd3834bae470b278d98b32546176d607d6..3b2724d67276887ac0c2a424a471f67403cfe072 100644
--- a/tools/itscertgen/cxml/cxml.vcxproj
+++ b/tools/itscertgen/cxml/cxml.vcxproj
@@ -54,6 +54,10 @@
     <OutDir>$(SolutionDir)build\msvc\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\msvc\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)build\msvc\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\msvc\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
diff --git a/tools/itscertgen/generator/certgen.c b/tools/itscertgen/generator/certgen.c
index 5f811f4d5aec4d5ed2c83b525b9d16f9d2976436..84d3214a348b5b05251eb10c9197607fe0a1004e 100644
--- a/tools/itscertgen/generator/certgen.c
+++ b/tools/itscertgen/generator/certgen.c
@@ -1503,6 +1503,11 @@ static int certificate_signature_tag (cxml_handler_t* const _h, cxml_tag_t * con
 				}
 			}
 
+			v = cxml_tag_attr_value(tag, "signer");
+			if (v){
+				h->signer = v;
+			}
+
 			if (h->signer == NULL){
 				fprintf(stderr, "ERROR: Signer certificate name shall be provided\n");
 				return -1;
diff --git a/tools/itscertgen/generator/itscertgen.vcxproj b/tools/itscertgen/generator/itscertgen.vcxproj
index 0bf44d0e10e7982232acf08c4cc1a244cea2ebde..1164e1d3c8c3d3121c95e856b117a77daaca841c 100644
--- a/tools/itscertgen/generator/itscertgen.vcxproj
+++ b/tools/itscertgen/generator/itscertgen.vcxproj
@@ -66,6 +66,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)build\msvc\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\msvc\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/tools/itscertgen/msgcheck/msgcheck.vcxproj b/tools/itscertgen/msgcheck/msgcheck.vcxproj
index 9a3baf803a9039efa3d4aa8cc5e640c4c4cab5fd..1abde67c3340ffdfd5815f895d9d1c9e756d8c37 100644
--- a/tools/itscertgen/msgcheck/msgcheck.vcxproj
+++ b/tools/itscertgen/msgcheck/msgcheck.vcxproj
@@ -64,12 +64,12 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\OpenSSL-Win32\include;..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\OpenSSL\Win32\include;..</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>C:\OpenSSL-Win32\lib\VC\static</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\OpenSSL\Win32\lib\VC\static</AdditionalLibraryDirectories>
       <AdditionalDependencies>libeay32MDd.lib;ssleay32MDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -82,14 +82,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\OpenSSL-Win32\include;..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\OpenSSL\Win32\include;..</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\OpenSSL-Win32\lib\VC\static</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\OpenSSL\Win32\lib\VC\static</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />