diff --git a/dmtree/tr181/managementserver.c b/dmtree/tr181/managementserver.c
index 3188c8de..c523c9e9 100644
--- a/dmtree/tr181/managementserver.c
+++ b/dmtree/tr181/managementserver.c
@@ -28,7 +28,7 @@ static int get_management_server_url(char *refparam, struct dmctx *ctx, void *da
 	else if ((url != NULL) && (url[0] != '\0'))
 		*value = url;
 	else
-		*value = dmstrdup("http://192.168.1.1:8080/openacs/acs");
+		*value = "";
 	return 0;
 }
 
diff --git a/libbbf_api/dmuci.c b/libbbf_api/dmuci.c
index ddb79b68..49a8fc99 100644
--- a/libbbf_api/dmuci.c
+++ b/libbbf_api/dmuci.c
@@ -862,7 +862,7 @@ int varstate_get_value_string(char *package, char *section, char *option, char *
 	struct uci_ptr ptr = {0};
 
 	uci_add_delta_path(uci_varstate_ctx, uci_varstate_ctx->savedir);
-	uci_set_savedir(uci_varstate_ctx, VARSTATE_CONFIG);
+	uci_set_confdir(uci_varstate_ctx, VARSTATE_CONFIG);
 
 	if (dmuci_lookup_ptr(uci_varstate_ctx, &ptr, package, section, option, NULL)) {
 		*value = "";
diff --git a/test/files/var/state/cwmp b/test/files/var/state/cwmp
index 74c7ab3c..912d681b 100644
--- a/test/files/var/state/cwmp
+++ b/test/files/var/state/cwmp
@@ -1 +1,2 @@
-cwmp.acs.dhcp_url='http://192.168.1.123:8080/openacs'
+config acs 'acs'
+	option dhcp_url 'http://192.168.1.123:8080/openacs'
\ No newline at end of file