diff --git a/.clang-format b/.clang-format
index 16976a4b6..92c5b295a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -103,7 +103,7 @@ IncludeCategories:
     Priority:        100
   - Regex:           '^<vulkan/'
     Priority:        105
-  - Regex:           '^<(boost|fmt|hdf|numpy|pybind11)/'
+  - Regex:           '^(<(boost|fmt|numpy|pybind11)/)|<hdf5.h>'
     Priority:        110
   - Regex:           '^<.*'
     Priority:        120
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index c89fd8e3e..c79ff20a6 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -74,6 +74,7 @@ jobs:
               # Use conan from pypi to get the latest version
               pip install "conan>=2"
 
+              # TODO Write host/build profiles and use those
               conan profile detect
 
         - name: configure lue
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a7c36e18d..752da5476 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -53,6 +53,7 @@ jobs:
           run: |
               pip3 install "conan>=2" docopt jinja2 matplotlib
 
+              # TODO Write host/build profiles and use those
               conan profile detect
 
         - name: configure lue
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 101c0fe6a..93de7947a 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -19,14 +19,14 @@ jobs:
                 vs:
                   # - { name: "Visual Studio 16 2019", version: "16"}  # , toolset: "v142" }
                   - { name: "Visual Studio 17 2022", version: "17"}  # , toolset: "v143" }
-                toolset: ["14.2", "14.3"]
+                # toolset: ["14.2", "14.3"]
                 python-version: ["3.9"]
                 architecture: ["amd64"]
             fail-fast: false
 
         runs-on: ${{ matrix.os }}
 
-        name: ${{ matrix.os }} / ${{ matrix.vs.name }} (toolset ${{ matrix.toolset }}) / python - ${{ matrix.python-version }}
+        name: ${{ matrix.os }} / ${{ matrix.vs.name }} / python - ${{ matrix.python-version }}
 
         steps:
 
@@ -46,6 +46,7 @@ jobs:
                   docopt \
                   gdal \
                   hdf5 \
+                  hpx \
                   jinja2 \
                   libhwloc \
                   libvulkan-headers \
@@ -59,12 +60,13 @@ jobs:
               # Use conan from pypi to get the latest version
               pip install "conan>=2"
 
+              # TODO Write host/build profiles and use those
               conan profile detect
 
         - uses: ilammy/msvc-dev-cmd@v1
           with:
               arch: ${{ matrix.architecture }}
-              toolset: ${{ matrix.toolset }}
+              # toolset: ${{ matrix.toolset }}
               vsversion: ${{ matrix.vs.version }}
 
         - name: configure lue
@@ -88,14 +90,7 @@ jobs:
                       -D LUE_QA_TEST_NR_THREADS_PER_LOCALITY=2 \
                       -D LUE_DATA_MODEL_WITH_PYTHON_API=TRUE \
                       -D LUE_DATA_MODEL_WITH_UTILITIES=TRUE \
-                      -D LUE_FRAMEWORK_WITH_PYTHON_API=TRUE \
-                      -D LUE_BUILD_HPX=TRUE \
-                      -D HPX_USE_CMAKE_CXX_STANDARD=TRUE \
-                      -D HPX_WITH_MALLOC="mimalloc" \
-                      -D HPX_WITH_FETCH_ASIO=TRUE \
-                      -D HPX_WITH_PKGCONFIG=FALSE \
-                      -D HPX_WITH_EXAMPLES=FALSE \
-                      -D HPX_WITH_TESTS=FALSE
+                      -D LUE_FRAMEWORK_WITH_PYTHON_API=TRUE
 
         - name: build lue
           shell: bash -l {0}
diff --git a/environment/conda/build.sh b/environment/conda/build.sh
index 838738155..88080b604 100644
--- a/environment/conda/build.sh
+++ b/environment/conda/build.sh
@@ -4,22 +4,15 @@ set -x
 
 mkdir build
 
-if [[ "$target_platform" == "osx-64" ]]; then
-    export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
-fi
+if [[ $target_platform == linux* ]]; then
+    os="Linux"
+elif [[ $target_platform == osx* ]]; then
+    if [[ $target_platform == "osx-64" ]]; then
+        export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
+    fi
 
-if [[ "$target_platform" == "osx-64" || "$target_platform" == "osx-arm64" ]]; then
     export CXXFLAGS="${CXXFLAGS} -DTARGET_OS_OSX"
-fi
-
-echo "OSTYPE: $OSTYPE"
-
-if [[ -v OSTYPE ]]; then
-    if [[ $OSTYPE == "linux-gnu" ]]; then
-        os="Linux"
-    elif [[ $OSTYPE == darwin* ]]; then
-        os="Macos"
-    fi
+    os="Macos"
 fi
 
 cat > host_profile << EOF