diff --git a/src/luks/clevis-luks-common-functions.in b/src/luks/clevis-luks-common-functions.in

index 98cc9bc..12b2a11 100644

--- a/src/luks/clevis-luks-common-functions.in

+++ b/src/luks/clevis-luks-common-functions.in

@@ -22,12 +22,12 @@ CLEVIS_UUID="cb6e8904-81ff-40da-a84a-07ab9ab5715e"

 enable_debugging() {

     # Automatically enable debugging if in initramfs phase and rd.debug

-    if [ -e /usr/lib/dracut-lib.sh ]; then

+    if [ -e /usr/lib/dracut/modules.d/99base/dracut-lib.sh ]; then

         local bashopts=$-

         # Because dracut is loosely written, disable hardening options temporarily

         [[ $bashopts != *u* ]] || set +u

         [[ $bashopts != *e* ]] || set +e

-        . /usr/lib/dracut-lib.sh

+        . /usr/lib/dracut/modules.d/99base/dracut-lib.sh

         [[ $bashopts != *u* ]] || set -u

         [[ $bashopts != *e* ]] || set -e

     fi

diff --git a/src/luks/systemd/meson.build b/src/luks/systemd/meson.build

index e3b3d91..1e8c497 100644

--- a/src/luks/systemd/meson.build

+++ b/src/luks/systemd/meson.build

@@ -1,10 +1,10 @@

 systemd = dependency('systemd', required: false)

 sd_reply_pass = find_program(

-  join_paths(get_option('prefix'), get_option('libdir'), 'systemd', 'systemd-reply-password'),

-  join_paths(get_option('prefix'), 'lib', 'systemd', 'systemd-reply-password'),

-  join_paths('/', 'usr', get_option('libdir'), 'systemd', 'systemd-reply-password'),

-  join_paths('/', 'usr', 'lib', 'systemd', 'systemd-reply-password'),

+  join_paths('/', 'lib', 'systemd', 'systemd-reply-password'),

+  join_paths('/', 'lib', 'systemd', 'systemd-reply-password'),

+  join_paths('/', 'lib', 'systemd', 'systemd-reply-password'),

+  join_paths('/', 'lib', 'systemd', 'systemd-reply-password'),

   required: false

 )

diff --git a/src/luks/tests/meson.build b/src/luks/tests/meson.build

index 80d4ff0..9fa1ecd 100644

--- a/src/luks/tests/meson.build

+++ b/src/luks/tests/meson.build

@@ -3,7 +3,7 @@ jq = find_program('jq', required: false)

 # We use cryptsetup for testing LUKS2 binding and saving the token in a

 # given token slot.

-cryptsetup = find_program('cryptsetup', required: true)

+cryptsetup = find_program(join_paths('/', 'sbin', 'cryptsetup'), required: true)

 # Use keyctl to check an existing token id can be created from

 # kernel keyring password