diff --git a/.azure/templates/build-test.yml b/.azure/templates/build-test.yml
index d82eeb8f75..0d767796ff 100644
--- a/.azure/templates/build-test.yml
+++ b/.azure/templates/build-test.yml
@@ -62,7 +62,7 @@ steps:
       } else {
         Write-Host "###vso[task.setvariable variable=build_tool_options;]-j 4"
       }
-      choco install -y openssl
+      #choco install -y openssl
     condition: eq(variables['Agent.OS'], 'Windows_NT')
     name: setup_windows
   - task: Cache@2
@@ -143,7 +143,7 @@ steps:
             -DBUILD_IDLC_XTESTS=${IDLC_XTESTS:-on} \
             -DBUILD_EXAMPLES=on \
             -DWERROR=on \
-            ${GENERATOR:+-G}${GENERATOR} -A "${PLATFORM}" -T "${TOOLSET}" ..
+            ${GENERATOR:+-G} "${GENERATOR}" -A "${PLATFORM}" -T "${TOOLSET}" ..
       ${SCAN_BUILD} cmake --build . --config ${BUILD_TYPE} --target install -- ${BUILD_TOOL_OPTIONS}
       cmake --build . --config ${BUILD_TYPE} --target package -- ${BUILD_TOOL_OPTIONS}
     name: script