diff --git a/winpr/include/winpr/stream.h b/winpr/include/winpr/stream.h
index 141e0c755..9e61d5cd9 100644
--- a/winpr/include/winpr/stream.h
+++ b/winpr/include/winpr/stream.h
@@ -1109,7 +1109,7 @@ extern "C"
 	WINPR_API void Stream_AddRef(wStream* s);
 	WINPR_API void Stream_Release(wStream* s);
 
-	WINPR_API wStream* StreamPool_Find(wStreamPool* pool, BYTE* ptr);
+	WINPR_API wStream* StreamPool_Find(wStreamPool* pool, const BYTE* ptr);
 
 	WINPR_API void StreamPool_Clear(wStreamPool* pool);
 
diff --git a/winpr/libwinpr/utils/collections/StreamPool.c b/winpr/libwinpr/utils/collections/StreamPool.c
index 93830939b..f47c9d5a5 100644
--- a/winpr/libwinpr/utils/collections/StreamPool.c
+++ b/winpr/libwinpr/utils/collections/StreamPool.c
@@ -301,27 +301,26 @@ void Stream_Release(wStream* s)
  * Find stream in pool using pointer inside buffer
  */
 
-wStream* StreamPool_Find(wStreamPool* pool, BYTE* ptr)
+wStream* StreamPool_Find(wStreamPool* pool, const BYTE* ptr)
 {
 	wStream* s = NULL;
-	BOOL found = FALSE;
 
 	StreamPool_Lock(pool);
 
 	for (size_t index = 0; index < pool->uSize; index++)
 	{
-		s = pool->uArray[index];
+		wStream* cur = pool->uArray[index];
 
-		if ((ptr >= Stream_Buffer(s)) && (ptr < (Stream_Buffer(s) + Stream_Capacity(s))))
+		if ((ptr >= Stream_Buffer(cur)) && (ptr < (Stream_Buffer(cur) + Stream_Capacity(cur))))
 		{
-			found = TRUE;
+			s = cur;
 			break;
 		}
 	}
 
 	StreamPool_Unlock(pool);
 
-	return (found) ? s : NULL;
+	return s;
 }
 
 /**
diff --git a/winpr/libwinpr/utils/image.c b/winpr/libwinpr/utils/image.c
index 602437c25..82b144d51 100644
--- a/winpr/libwinpr/utils/image.c
+++ b/winpr/libwinpr/utils/image.c
@@ -658,8 +658,10 @@ fail:
 #endif
 }
 
+// NOLINTBEGIN(readability-non-const-parameter)
 SSIZE_T winpr_convert_from_jpeg(const BYTE* comp_data, size_t comp_data_bytes, UINT32* width,
                                 UINT32* height, UINT32* bpp, BYTE** ppdecomp_data)
+// NOLINTEND(readability-non-const-parameter)
 {
 	WINPR_ASSERT(comp_data || (comp_data_bytes == 0));
 	WINPR_ASSERT(width);
diff --git a/winpr/libwinpr/winsock/winsock.c b/winpr/libwinpr/winsock/winsock.c
index 6cb0c9a0a..435c3bc5e 100644
--- a/winpr/libwinpr/winsock/winsock.c
+++ b/winpr/libwinpr/winsock/winsock.c
@@ -1042,6 +1042,7 @@ int _connect(SOCKET s, const struct sockaddr* name, int namelen)
 	return status;
 }
 
+// NOLINTNEXTLINE(readability-non-const-parameter)
 int _ioctlsocket(SOCKET s, long cmd, u_long* argp)
 {
 	int fd = (int)s;