diff --git a/common/platform_constants.h b/common/platform_constants.h
index 091ad08a4f..2faadc3dcd 100644
--- a/common/platform_constants.h
+++ b/common/platform_constants.h
@@ -83,7 +83,7 @@
 #define MAX_NUM_SLICES 1024
 
 // RLC Entity
-#define RLC_TX_MAXSIZE       2000000
+#define RLC_TX_MAXSIZE       10000000
 #define RLC_RX_MAXSIZE       10000000
 #define SEND_MRW_ON 240
 #define MAX_ANT 8
diff --git a/docker/Dockerfile.nakaolab.test b/docker/Dockerfile.nakaolab.test
index 3f75050a2a..59862908d9 100644
--- a/docker/Dockerfile.nakaolab.test
+++ b/docker/Dockerfile.nakaolab.test
@@ -30,10 +30,16 @@ RUN set -eux; \
   rm -rf /var/lib/apt/lists/*
 
 # FlexRIC libraries (built by --build-e2) - only copy service model libraries (*_sm.so)
+# Also rebuild xapp_nakaolab (not built by default in build_oai)
 RUN mkdir -p /usr/local/etc/flexric /usr/local/lib/flexric && \
     find /oai-ran/openair2/E2AP/flexric/build -name "*_sm.so" -exec cp {} /usr/local/lib/flexric/ \; && \
     cp /oai-ran/openair2/E2AP/flexric/flexric.conf /usr/local/etc/flexric/ 2>/dev/null || true && \
     echo "/usr/local/lib/flexric" > /etc/ld.so.conf.d/flexric.conf && ldconfig && \
+    cd /oai-ran/openair2/E2AP/flexric/build && \
+    sed -i 's|/home/[^/]*/openairinterface5g|/oai-ran|g' CMakeCache.txt && \
+    find . -name 'Makefile' -o -name '*.cmake' | xargs sed -i 's|/home/[^/]*/openairinterface5g|/oai-ran|g' 2>/dev/null || true && \
+    rm -f examples/xApp/c/monitor/CMakeFiles/xapp_nakaolab.dir/xapp_nakaolab.c.o && \
+    cmake --build . --target xapp_nakaolab 2>&1 | tail -5 && \
     ls -la /usr/local/lib/flexric/
 
 # Install netcat for antenna control testing + paramiko for M-Plane NETCONF server
diff --git a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_kpm.c b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_kpm.c
index 9f6db07d6e..670b62104e 100644
--- a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_kpm.c
+++ b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_kpm.c
@@ -178,7 +178,7 @@ static void capture_sst_sd(test_cond_value_t* test_cond_value, uint8_t *sst, uin
         *sd = malloc(sizeof(uint32_t));
         **sd = buf[1] << 16 | buf[2] << 8 | buf[3];
       }
-      /* printf("[E2 AGENT][E2SM-KPM] Condition NSSAI (%d, %x).\n", *sst, (*sd) ? **sd : 0xffffff); */
+      /* printf("[E2 AGENT][E2SM-KPM] Condition NSSAI (sst=%d, sd=%x).\n", *sst, (*sd) ? **sd : 0xffffff); */
       break;
     }
     default: