diff --git a/src/ulib/net/server/plugin/usp/mdb.usp b/src/ulib/net/server/plugin/usp/mdb.usp
index dc3c38b3..c9b23dbe 100644
--- a/src/ulib/net/server/plugin/usp/mdb.usp
+++ b/src/ulib/net/server/plugin/usp/mdb.usp
@@ -54,8 +54,8 @@ UString result;
 (void) U_JFIND(mc->vitem[0], "randomNumber", result);
 
 #ifdef AS_cpoll_cppsp_DO
-char* s = UClientImage_Base::wbuffer->data();
-char* p = start;
+char* s     = UClientImage_Base::wbuffer->data();
+char* ptr   = s;
 uint32_t sz = result.size();
 
 u_put_unalignedp32(ptr,   U_MULTICHAR_CONSTANT32('{','"','i','d'));
diff --git a/src/ulib/net/server/plugin/usp/mquery.usp b/src/ulib/net/server/plugin/usp/mquery.usp
index b61c64e4..b6b94e43 100644
--- a/src/ulib/net/server/plugin/usp/mquery.usp
+++ b/src/ulib/net/server/plugin/usp/mquery.usp
@@ -63,10 +63,10 @@ UString rnumber;
 int i = 0, num_queries = UHTTP::getFormFirstNumericValue(1, 500);
 
 #ifdef AS_cpoll_cppsp_DO
-UClientImage_Base::wbuffer->setBuffer(36U * 500U);
+UClientImage_Base::wbuffer->setBuffer(36U * num_queries);
 
-char* s = UClientImage_Base::wbuffer->data();
-char* p = start;
+char* s   = UClientImage_Base::wbuffer->data();
+char* ptr = s;
 
 *ptr++ = '[';
 #endif
diff --git a/src/ulib/net/server/plugin/usp/mupdate.usp b/src/ulib/net/server/plugin/usp/mupdate.usp
index 2e7c1fca..e0ecdb80 100644
--- a/src/ulib/net/server/plugin/usp/mupdate.usp
+++ b/src/ulib/net/server/plugin/usp/mupdate.usp
@@ -63,10 +63,10 @@ uint32_t id, rnum;
 int i = 0, num_queries = UHTTP::getFormFirstNumericValue(1, 500);
 
 #ifdef AS_cpoll_cppsp_DO
-UClientImage_Base::wbuffer->setBuffer(36U * 500U);
+UClientImage_Base::wbuffer->setBuffer(36U * num_queries);
 
-char* s = UClientImage_Base::wbuffer->data();
-char* p = start;
+char* s   = UClientImage_Base::wbuffer->data();
+char* ptr = s;
 
 *ptr++ = '[';
 #endif
diff --git a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mdb.usp b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mdb.usp
index dc3c38b3..c9b23dbe 100644
--- a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mdb.usp
+++ b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mdb.usp
@@ -54,8 +54,8 @@ UString result;
 (void) U_JFIND(mc->vitem[0], "randomNumber", result);
 
 #ifdef AS_cpoll_cppsp_DO
-char* s = UClientImage_Base::wbuffer->data();
-char* p = start;
+char* s     = UClientImage_Base::wbuffer->data();
+char* ptr   = s;
 uint32_t sz = result.size();
 
 u_put_unalignedp32(ptr,   U_MULTICHAR_CONSTANT32('{','"','i','d'));
diff --git a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mquery.usp b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mquery.usp
index b61c64e4..b6b94e43 100644
--- a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mquery.usp
+++ b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mquery.usp
@@ -63,10 +63,10 @@ UString rnumber;
 int i = 0, num_queries = UHTTP::getFormFirstNumericValue(1, 500);
 
 #ifdef AS_cpoll_cppsp_DO
-UClientImage_Base::wbuffer->setBuffer(36U * 500U);
+UClientImage_Base::wbuffer->setBuffer(36U * num_queries);
 
-char* s = UClientImage_Base::wbuffer->data();
-char* p = start;
+char* s   = UClientImage_Base::wbuffer->data();
+char* ptr = s;
 
 *ptr++ = '[';
 #endif
diff --git a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mupdate.usp b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mupdate.usp
index 2e7c1fca..e0ecdb80 100644
--- a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mupdate.usp
+++ b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mupdate.usp
@@ -63,10 +63,10 @@ uint32_t id, rnum;
 int i = 0, num_queries = UHTTP::getFormFirstNumericValue(1, 500);
 
 #ifdef AS_cpoll_cppsp_DO
-UClientImage_Base::wbuffer->setBuffer(36U * 500U);
+UClientImage_Base::wbuffer->setBuffer(36U * num_queries);
 
-char* s = UClientImage_Base::wbuffer->data();
-char* p = start;
+char* s   = UClientImage_Base::wbuffer->data();
+char* ptr = s;
 
 *ptr++ = '[';
 #endif