diff --git a/Makefile.in b/Makefile.in
index 9ded5adda..e7f44c098 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@ clean:
 
 run: all
 	SPA_PLUGIN_DIR=$(BUILD_ROOT)/spa/plugins \
-	SPA_DATA_DIR=$(BUILD_ROOT)/spa/plugins \
+	SPA_DATA_DIR=$(SOURCE_ROOT)/spa/plugins \
 	PIPEWIRE_MODULE_DIR=$(BUILD_ROOT)/src/modules \
 	PATH=$(BUILD_ROOT)/src/examples:$(PATH) \
 	PIPEWIRE_CONFIG_DIR=$(BUILD_ROOT)/src/daemon \
@@ -27,7 +27,7 @@ run: all
 
 run-pulse: all
 	SPA_PLUGIN_DIR=$(BUILD_ROOT)/spa/plugins \
-	SPA_DATA_DIR=$(BUILD_ROOT)/spa/plugins \
+	SPA_DATA_DIR=$(SOURCE_ROOT)/spa/plugins \
 	PIPEWIRE_MODULE_DIR=$(BUILD_ROOT)/src/modules \
 	PIPEWIRE_CONFIG_DIR=$(BUILD_ROOT)/src/daemon \
 	ACP_PATHS_DIR=$(SOURCE_ROOT)/spa/plugins/alsa/mixer/paths \
@@ -48,13 +48,13 @@ benchmark: all
 
 monitor: all
 	SPA_PLUGIN_DIR=$(BUILD_ROOT)/spa/plugins \
-	SPA_DATA_DIR=$(BUILD_ROOT)/spa/plugins \
+	SPA_DATA_DIR=$(SOURCE_ROOT)/spa/plugins \
 	PIPEWIRE_MODULE_DIR=$(BUILD_ROOT)/src/modules/ \
 	$(BUILD_ROOT)/src/tools/pw-mon
 
 cli: all
 	SPA_PLUGIN_DIR=$(BUILD_ROOT)/spa/plugins \
-	SPA_DATA_DIR=$(BUILD_ROOT)/spa/plugins \
+	SPA_DATA_DIR=$(SOURCE_ROOT)/spa/plugins \
 	PIPEWIRE_MODULE_DIR=$(BUILD_ROOT)/src/modules/ \
 	$(BUILD_ROOT)/src/tools/pw-cli
 
diff --git a/spa/plugins/bluez5/quirks.c b/spa/plugins/bluez5/quirks.c
index 16a8ebaa9..7612e9ae6 100644
--- a/spa/plugins/bluez5/quirks.c
+++ b/spa/plugins/bluez5/quirks.c
@@ -262,14 +262,16 @@ struct spa_bt_quirks *spa_bt_quirks_create(const struct spa_dict *info, struct s
 	} else {
 		char path[PATH_MAX];
 		const char *dir = getenv("SPA_DATA_DIR");
+		int res;
 
 		if (dir == NULL)
 			dir = SPADATADIR;
 
 		if (spa_scnprintf(path, sizeof(path), "%s/bluez5/bluez-hardware.conf", dir) >= 0)
-			load_conf(this, path);
+			if ((res = load_conf(this, path)) < 0)
+				spa_log_warn(this->log, "failed to load '%s': %s", path,
+						spa_strerror(res));
 	}
-
 	if (!(this->kernel_rules && this->adapter_rules && this->device_rules))
 		spa_log_warn(this->log, "failed to load bluez-hardware.conf");
 
diff --git a/test/pwtest.c b/test/pwtest.c
index d50b3953e..18be5c6ad 100644
--- a/test/pwtest.c
+++ b/test/pwtest.c
@@ -804,7 +804,7 @@ static void set_test_env(struct pwtest_context *ctx, struct pwtest_test *t)
 	replace_env(t, "TMPDIR", xdg_runtime_dir);
 
 	replace_env(t, "SPA_PLUGIN_DIR", BUILD_ROOT "/spa/plugins");
-	replace_env(t, "SPA_DATA_DIR", BUILD_ROOT "/spa/plugins");
+	replace_env(t, "SPA_DATA_DIR", SOURCE_ROOT "/spa/plugins");
 	replace_env(t, "PIPEWIRE_CONFIG_DIR", BUILD_ROOT "/src/daemon");
 	replace_env(t, "PIPEWIRE_MODULE_DIR", BUILD_ROOT "/src/modules");
 	replace_env(t, "ACP_PATHS_DIR", SOURCE_ROOT "/spa/plugins/alsa/mixer/paths");