diff -r d33eaaec15da -r 287484519844 ucx/properties.c
--- a/ucx/properties.c	Fri Dec 12 10:42:53 2025 +0100
+++ b/ucx/properties.c	Fri Dec 19 17:22:03 2025 +0100
@@ -68,8 +68,8 @@
     if (cxBufferEof(&prop->input)) {
         // destroy a possible previously initialized buffer
         cxBufferDestroy(&prop->input);
-        cxBufferInit(&prop->input, (void*) buf, len,
-            NULL, CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_AUTO_EXTEND);
+        cxBufferInit(&prop->input, NULL, (void*) buf,
+                     len, CX_BUFFER_COPY_ON_WRITE | CX_BUFFER_AUTO_EXTEND);
         prop->input.size = len;
     } else {
         if (cxBufferAppend(buf, 1, len, &prop->input) < len) return -1;
@@ -82,7 +82,7 @@
         char *buf,
         size_t capacity
 ) {
-    cxBufferInit(&prop->buffer, buf, capacity, NULL, CX_BUFFER_COPY_ON_EXTEND);
+    cxBufferInit(&prop->buffer, NULL, buf, capacity, CX_BUFFER_COPY_ON_EXTEND);
 }
 
 CxPropertiesStatus cxPropertiesNext(
@@ -190,7 +190,7 @@
             assert(cxBufferEof(&prop->buffer));
             if (prop->buffer.space == NULL) {
                 // initialize a rescue buffer, if the user did not provide one
-                cxBufferInit(&prop->buffer, NULL, 256, NULL, CX_BUFFER_AUTO_EXTEND);
+                cxBufferInit(&prop->buffer, NULL, NULL, 256, CX_BUFFER_AUTO_EXTEND);
             } else {
                 // from a previous rescue there might be already read data
                 // reset the buffer to avoid unnecessary buffer extension
@@ -251,7 +251,7 @@
                     if (current_buffer != &prop->buffer) {
                         // move value to the rescue buffer
                         if (prop->buffer.space == NULL) {
-                            cxBufferInit(&prop->buffer, NULL, 256, NULL, CX_BUFFER_AUTO_EXTEND);
+                            cxBufferInit(&prop->buffer, NULL, NULL, 256, CX_BUFFER_AUTO_EXTEND);
                         }
                         prop->buffer.size = 0;
                         prop->buffer.pos = 0;
@@ -312,8 +312,8 @@
 #endif
 const unsigned cx_properties_load_buf_size = CX_PROPERTIES_LOAD_BUF_SIZE;
 
-CxPropertiesStatus cx_properties_load(CxPropertiesConfig config,
-        const CxAllocator *allocator, cxstring filename, CxMap *target) {
+CxPropertiesStatus cx_properties_load(const CxAllocator *allocator,
+                                      cxstring filename, CxMap *target, CxPropertiesConfig config) {
     if (allocator == NULL) {
         allocator = cxDefaultAllocator;
     }