diff --git a/.basedpyright/baseline.json b/.basedpyright/baseline.json
index be117578a..6d920e136 100644
--- a/.basedpyright/baseline.json
+++ b/.basedpyright/baseline.json
@@ -962,34 +962,42 @@
                 }
             },
             {
-                "code": "reportAssignmentType",
+                "code": "reportUnknownVariableType",
                 "range": {
-                    "startColumn": 12,
-                    "endColumn": 27,
+                    "startColumn": 8,
+                    "endColumn": 15,
                     "lineCount": 1
                 }
             },
             {
-                "code": "reportUnknownVariableType",
+                "code": "reportUnknownArgumentType",
                 "range": {
-                    "startColumn": 4,
-                    "endColumn": 9,
+                    "startColumn": 29,
+                    "endColumn": 36,
                     "lineCount": 1
                 }
             },
             {
-                "code": "reportUnknownMemberType",
+                "code": "reportUnknownArgumentType",
+                "range": {
+                    "startColumn": 48,
+                    "endColumn": 55,
+                    "lineCount": 1
+                }
+            },
+            {
+                "code": "reportAssignmentType",
                 "range": {
                     "startColumn": 12,
-                    "endColumn": 23,
+                    "endColumn": 27,
                     "lineCount": 1
                 }
             },
             {
-                "code": "reportUnknownArgumentType",
+                "code": "reportArgumentType",
                 "range": {
-                    "startColumn": 11,
-                    "endColumn": 16,
+                    "startColumn": 8,
+                    "endColumn": 28,
                     "lineCount": 1
                 }
             },
@@ -2457,6 +2465,14 @@
                     "lineCount": 1
                 }
             },
+            {
+                "code": "reportUnknownArgumentType",
+                "range": {
+                    "startColumn": 37,
+                    "endColumn": 40,
+                    "lineCount": 1
+                }
+            },
             {
                 "code": "reportUnknownVariableType",
                 "range": {
@@ -4243,6 +4259,14 @@
                     "lineCount": 1
                 }
             },
+            {
+                "code": "reportArgumentType",
+                "range": {
+                    "startColumn": 70,
+                    "endColumn": 75,
+                    "lineCount": 1
+                }
+            },
             {
                 "code": "reportUnknownVariableType",
                 "range": {
@@ -4683,14 +4707,6 @@
                     "lineCount": 1
                 }
             },
-            {
-                "code": "reportArgumentType",
-                "range": {
-                    "startColumn": 59,
-                    "endColumn": 69,
-                    "lineCount": 1
-                }
-            },
             {
                 "code": "reportUnknownArgumentType",
                 "range": {
@@ -18826,24 +18842,6 @@
                 }
             }
         ],
-        "./pyopencl/cltypes.py": [
-            {
-                "code": "reportUnknownVariableType",
-                "range": {
-                    "startColumn": 16,
-                    "endColumn": 27,
-                    "lineCount": 1
-                }
-            },
-            {
-                "code": "reportUnknownArgumentType",
-                "range": {
-                    "startColumn": 36,
-                    "endColumn": 81,
-                    "lineCount": 1
-                }
-            }
-        ],
         "./pyopencl/compyte/array.py": [
             {
                 "code": "reportUnknownParameterType",
@@ -22775,14 +22773,6 @@
                     "lineCount": 1
                 }
             },
-            {
-                "code": "reportCallIssue",
-                "range": {
-                    "startColumn": 11,
-                    "endColumn": 82,
-                    "lineCount": 1
-                }
-            },
             {
                 "code": "reportCallIssue",
                 "range": {
diff --git a/pyproject.toml b/pyproject.toml
index ec9768bb0..926447e1e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -199,6 +199,7 @@ MACOSX_DEPLOYMENT_TARGET = "10.14"
 skip = [
     "*-win32",
 ]
+repair-wheel-command = "delvewheel repair -w {dest_dir} --exclude ext-ms-win-dx-dxdbhelper-l1-1-0.dll {wheel}"
 test-command = ""
 before-all = "bash {package}/scripts/build-ocl-windows.sh"
 
@@ -243,7 +244,7 @@ reportPrivateUsage = "hint"
 # we care about at this moment.
 # https://github.com/microsoft/pyright/issues/746
 reportImportCycles = "none"
-pythonVersion = "3.10"
+pythonVersion = "3.12"
 pythonPlatform = "All"
 
 reportAny = "none"
diff --git a/scripts/build-ocl-windows.sh b/scripts/build-ocl-windows.sh
index ce23c154d..c74ef655d 100644
--- a/scripts/build-ocl-windows.sh
+++ b/scripts/build-ocl-windows.sh
@@ -8,14 +8,14 @@ git clone --branch v2022.01.04 https://github.com/KhronosGroup/OpenCL-ICD-Loader
 git clone --branch v2022.01.04 https://github.com/KhronosGroup/OpenCL-Headers
 
 
-cmake -D CMAKE_INSTALL_PREFIX=./OpenCL-Headers/install -S ./OpenCL-Headers -B ./OpenCL-Headers/build
+cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -D CMAKE_INSTALL_PREFIX=./OpenCL-Headers/install -S ./OpenCL-Headers -B ./OpenCL-Headers/build
 cmake --build ./OpenCL-Headers/build --target install
 
 # if someone would like to try to create win32 wheels the below lines may be useful
-# cmake -D CMAKE_PREFIX_PATH=${PWD}/OpenCL-Headers/install -DOPENCL_ICD_LOADER_HEADERS_DIR=${PWD}/OpenCL-Headers/install/include -S ./OpenCL-ICD-Loader -B ./OpenCL-ICD-Loader/build
+# cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -D CMAKE_PREFIX_PATH=${PWD}/OpenCL-Headers/install -DOPENCL_ICD_LOADER_HEADERS_DIR=${PWD}/OpenCL-Headers/install/include -S ./OpenCL-ICD-Loader -B ./OpenCL-ICD-Loader/build
 # cmake --build ./OpenCL-ICD-Loader/build --target install --config Release
 
-cmake -D CMAKE_PREFIX_PATH=${PWD}/OpenCL-Headers/install -D OPENCL_ICD_LOADER_HEADERS_DIR=${PWD}/OpenCL-Headers/install/include -S ./OpenCL-ICD-Loader -B ./OpenCL-ICD-Loader/build2 -A x64
+cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -D CMAKE_PREFIX_PATH=${PWD}/OpenCL-Headers/install -D OPENCL_ICD_LOADER_HEADERS_DIR=${PWD}/OpenCL-Headers/install/include -S ./OpenCL-ICD-Loader -B ./OpenCL-ICD-Loader/build2 -A x64
 cmake --build ./OpenCL-ICD-Loader/build2 --target install --config Release
 
 echo "PyOpenCL wheel includes Khronos Group OpenCL-ICD-Loader which is licensed as below:" >> ${SCRIPT_DIR}/../LICENSE