diff --git a/src/IKVM.Runtime/LibJVM.cs b/src/IKVM.Runtime/LibJVM.cs
index ce660fdc5..5ae43090b 100644
--- a/src/IKVM.Runtime/LibJVM.cs
+++ b/src/IKVM.Runtime/LibJVM.cs
@@ -240,7 +240,7 @@ void JVM_ArrayCopy(JNIEnv* env, nint ignored, nint src, int src_pos, nint dst, i
 
                 Array.Copy(s, src_pos, d, dst_pos, length);
             }
-            catch (ArrayTypeMismatchException e)
+            catch (ArrayTypeMismatchException)
             {
                 JVM.SetPendingException(new java.lang.ArrayStoreException());
             }
diff --git a/src/libiava/libiava.clangproj b/src/libiava/libiava.clangproj
index 54c700f79..d4ed686c0 100644
--- a/src/libiava/libiava.clangproj
+++ b/src/libiava/libiava.clangproj
@@ -18,8 +18,8 @@
         <Header Include="$(OpenJdkDir)jdk\src\share\native\common\*.h" />
         <Header Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\common\*.h" />
         <PreprocessorDefinitions Include="RELEASE" Value="&quot;$(Version)&quot;" />
-        <PreprocessorDefinitions Include="VENDOR" Value="&quot;IKVM&quot;" />
-        <PreprocessorDefinitions Include="VENDOR_URL" Value="&quot;https://ikvm.org&quot;" />
+        <PreprocessorDefinitions Include="VENDOR" Value="&quot;$(ProductName)&quot;" />
+        <PreprocessorDefinitions Include="VENDOR_URL" Value="&quot;$(PackageProjectUrl)&quot;" />
         <PreprocessorDefinitions Include="VENDOR_URL_BUG" Value="&quot;https://github.com/ikvmnet/ikvm/issues&quot;" />
         <PreprocessorDefinitions Include="ARCHPROPNAME" Value="&quot;$(OpenJdkTargetCpuOsArch)&quot;" />
         <LibJavaDirs Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\java\lang" />
@@ -41,7 +41,6 @@
     <ItemGroup>
         <!-- IKVM specific excludes -->
         <LibJavaExclude Include="Shutdown.c" />
-        <LibJavaExclude Include="System.c" />
         <LibJavaExclude Include="AccessController.c" />
         <LibJavaExclude Include="Throwable.c" />
         <LibJavaExclude Include="NativeAccessors.c" />