diff --git a/src/barebox-state/state.c b/src/barebox-state/state.c
index e64111d..4adc065 100644
--- a/src/barebox-state/state.c
+++ b/src/barebox-state/state.c
@@ -285,9 +285,8 @@
 
 		if ((conv == STATE_CONVERT_TO_NODE)
 		    || (conv == STATE_CONVERT_FIXUP)) {
-			ret = of_set_property(new_node, "type",
-					      vtype->type_name,
-					      strlen(vtype->type_name) + 1, 1);
+			ret = of_property_write_string(new_node, "type",
+						       vtype->type_name);
 			if (ret)
 				goto out;
 
diff --git a/src/barebox-state/state_variables.c b/src/barebox-state/state_variables.c
index fd072a0..cd42c2a 100644
--- a/src/barebox-state/state_variables.c
+++ b/src/barebox-state/state_variables.c
@@ -331,8 +331,7 @@
 	int ret = 0;
 
 	if (string->value_default) {
-		ret = of_set_property(node, "default", string->value_default,
-				      strlen(string->value_default) + 1, 1);
+		ret = of_property_write_string(node, "default", string->value_default);
 
 		if (ret)
 			return ret;
@@ -342,8 +341,7 @@
 		return 0;
 
 	if (string->value)
-		ret = of_set_property(node, "value", string->value,
-				      strlen(string->value) + 1, 1);
+		ret = of_property_write_string(node, "value", string->value);
 
 	return ret;
 }
diff --git a/src/libdt.c b/src/libdt.c
index 8236a69..ded2916 100644
--- a/src/libdt.c
+++ b/src/libdt.c
@@ -1921,7 +1921,7 @@
  */
 int of_device_disable(struct device_node *node)
 {
-	return of_set_property(node, "status", "disabled", sizeof("disabled"), 1);
+	return of_property_write_string(node, "status", "disabled");
 }
 
 /**