diff --git a/alire.toml b/alire.toml
index 1e2fbed1c..d62d577d8 100644
--- a/alire.toml
+++ b/alire.toml
@@ -50,8 +50,8 @@ windows = { ALIRE_OS = "windows" }
 aaa = { url = "https://github.com/mosteo/aaa", commit = "dff61d2615cc6332fa6205267bae19b4d044b9da" }
 ada_toml = { url = "https://github.com/mosteo/ada-toml", commit = "da4e59c382ceb0de6733d571ecbab7ea4919b33d" }
 clic = { url = "https://github.com/alire-project/clic", commit = "de0330053584bad4dbb3dbd5e1ba939c4e8c6b55" }
-dirty_booleans = { url = "https://github.com/mosteo/dirty_booleans", branch = "main" }
-diskflags = { url = "https://github.com/mosteo/diskflags", branch = "main" }
+dirty_booleans = { url = "https://github.com/mosteo/dirty_booleans", branch = "alire" }
+diskflags = { url = "https://github.com/mosteo/diskflags", branch = "alire" }
 gnatcoll = { url = "https://github.com/alire-project/gnatcoll-core.git", commit = "4e663b87a028252e7e074f054f8f453661397166" }
 minirest = { url = "https://github.com/mosteo/minirest.git", commit = "9a9c660f9c6f27f5ef75417e7fac7061dff14d78" }
 semantic_versioning = { url = "https://github.com/alire-project/semantic_versioning", commit = "2f23fc5f6b4855b836b599adf292fed9c0ed4144" }
diff --git a/src/alire/alire-properties-actions-executor.ads b/src/alire/alire-properties-actions-executor.ads
index 332748657..5cb343161 100644
--- a/src/alire/alire-properties-actions-executor.ads
+++ b/src/alire/alire-properties-actions-executor.ads
@@ -18,11 +18,12 @@ package Alire.Properties.Actions.Executor is
                               Env     : Properties.Vector;
                               Moment  : Moments);
    --  Run Release actions that apply to a given environment. IMPORTANT: the
-   --  working directory at the moment of this call should be the workspace
-   --  root. Recommended for toolchains or direct execution only (e.g. `alr
-   --  action`), otherwise better use the previous call that takes into account
-   --  the Root context. Will raise Action_Failed if the spawned command exits
-   --  with failure. Will not skip post-fetch even if already run.
+   --  working directory at the moment of this call should be the release (not
+   --  workspace!) root. Recommended for toolchains or direct execution only
+   --  (e.g. `alr action`), otherwise better use the previous call that takes
+   --  into account the Root context. Will raise Action_Failed if the spawned
+   --  command exits with failure. Will not skip post-fetch even if already
+   --  run.
 
    procedure Execute_Actions
      (Release    : Releases.Release;
diff --git a/testsuite/tests/solver/compiler-priorities/test.py b/testsuite/tests/solver/compiler-priorities/test.py
index d9ee27fd9..86d0a50c4 100644
--- a/testsuite/tests/solver/compiler-priorities/test.py
+++ b/testsuite/tests/solver/compiler-priorities/test.py
@@ -10,7 +10,6 @@
 Those prefer first a native compiler. This case is out of scope of this test.
 """
 
-import subprocess
 import re
 
 from drivers.alr import run_alr, init_local_crate, alr_with
diff --git a/testsuite/tests/solver/compiler-selected/test.py b/testsuite/tests/solver/compiler-selected/test.py
index 0b9072e37..52b0527a9 100644
--- a/testsuite/tests/solver/compiler-selected/test.py
+++ b/testsuite/tests/solver/compiler-selected/test.py
@@ -1,13 +1,12 @@
 """
-Check solving with a configured preferred compiler
+Check solving with a configured preferred compiler. When the selected compiler
+fulfills the dependency, it is preferred over other available but not installed
+compilers.
 """
 
-import subprocess
-import os
 
 from drivers.alr import run_alr, init_local_crate, alr_with
-from drivers.asserts import assert_eq, assert_match, match_solution
-from re import escape as e
+from drivers.asserts import match_solution
 
 # Select the default preferred compiler, which is the native packaged one
 run_alr("toolchain", "--select")