diff --git a/tools/itscertgen/cshared/cshared.vcxproj b/tools/itscertgen/cshared/cshared.vcxproj
index c11a01283bf3dc5af3939b7b1de0f97e07c78268..653eaa3159d9cb0d871be6d2fe2430339dc77d6f 100644
--- a/tools/itscertgen/cshared/cshared.vcxproj
+++ b/tools/itscertgen/cshared/cshared.vcxproj
@@ -59,12 +59,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)build\MSVC-$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\MSVC-$(Configuration)\obj\$(ProjectName)\</IntDir>
+    <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)\obj\$(ProjectName)\</IntDir>
+    <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/cshared/cstr.c b/tools/itscertgen/cshared/cstr.c
index 41bcd923f231f4ab39e40a38a8be7b3dba030456..bd8835f5171f69898b6026449025290c19efd63c 100644
--- a/tools/itscertgen/cshared/cstr.c
+++ b/tools/itscertgen/cshared/cstr.c
@@ -243,7 +243,8 @@ const pchar_t * cstrlastpathelement(const pchar_t * str)
 	const pchar_t * p2 = pchar_rchr(str, '\\');
 	if(p<p2)p=p2;
 #endif
-	else if(p == NULL) p = str;
+	if(p == NULL) p = str;
+	else p++;
 	return p;
 }