diff --git a/build/cmake/DefinePlatformSpecifc.cmake b/build/cmake/DefinePlatformSpecifc.cmake
index 84409e6..a78d80c 100644
--- a/build/cmake/DefinePlatformSpecifc.cmake
+++ b/build/cmake/DefinePlatformSpecifc.cmake
@@ -25,8 +25,12 @@
 
 # basic options
 foreach(lang IN ITEMS C CXX)
-  if("CMAKE_${lang}_COMPILER_ID" STREQUAL "MSVC" OR "${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "MSVC")
+  if("CMAKE_${lang}_COMPILER_ID" STREQUAL "MSVC")
+    # These flags are not supported (or needed) with Clang-Cl on Windows:
     set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /MP") # parallel build
+  endif()
+
+  if("CMAKE_${lang}_COMPILER_ID" STREQUAL "MSVC" OR "${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "MSVC")
     set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /W3") # warning level 3
     include(CheckCXXCompilerFlag)
     set(CMAKE_REQUIRED_QUIET ON)
diff --git a/composer.json b/composer.json
index d1ada50..454beea 100644
--- a/composer.json
+++ b/composer.json
@@ -35,5 +35,19 @@
         "branch-alias": {
             "dev-master": "1.0.x-dev"
         }
+    },
+    "archive": {
+        "exclude": [
+            "*",
+            ".*",
+            "!/CHANGES.md",
+            "!/LICENSE",
+            "!/NOTICE",
+            "!/README.md",
+            "!/composer.json",
+            "!/lib/php/README.apache.md",
+            "!/lib/php/README.md",
+            "!/lib/php/lib"
+        ]
     }
 }