diff --git a/src/server_bind_tcp.c b/src/server_bind_tcp.c
index 43ea1e2..6a88801 100644
--- a/src/server_bind_tcp.c
+++ b/src/server_bind_tcp.c
@@ -27,7 +27,11 @@
 #include "tr/connect_entry_point.h"
 
 void
-TR_serverBindTcp(TR_Server this, const char * host, int port, TR_Protocol proto)
+TR_serverBindTcp(
+		TR_Server     this,
+		const char  * host,
+		int           port,
+		TR_Protocol   proto)
 {
 	TR_Socket socket = (TR_Socket)TR_new(
 			TR_TcpSocket,
@@ -35,7 +39,9 @@ TR_serverBindTcp(TR_Server this, const char * host, int port, TR_Protocol proto)
 			host,
 			port, 0);
 
-	TR_serverAddEndpoint(this, TR_new(TR_ConnEntryPoint, socket, proto));
+	TR_serverAddEndpoint(
+			this,
+			TR_new(TR_ConnEntryPoint, socket, proto, 2048));
 }
 
 // vim: set ts=4 sw=4:
diff --git a/src/server_bind_udp.c b/src/server_bind_udp.c
index b9a87e5..f6ee331 100644
--- a/src/server_bind_udp.c
+++ b/src/server_bind_udp.c
@@ -27,7 +27,11 @@
 #include "tr/datagram_entry_point.h"
 
 void
-TR_serverBindUdp(TR_Server this, const char * host, int port, TR_Protocol proto)
+TR_serverBindUdp(
+		TR_Server     this,
+		const char  * host,
+		int           port,
+		TR_Protocol   proto)
 {
 	TR_Socket socket = (TR_Socket)TR_new(
 			TR_UdpSocket,
@@ -35,7 +39,8 @@ TR_serverBindUdp(TR_Server this, const char * host, int port, TR_Protocol proto)
 			host,
 			port, 0);
 
-	TR_serverAddEndpoint(this, TR_new(TR_DatagramEntryPoint, socket, proto));
+	TR_serverAddEndpoint(
+			this, TR_new(TR_DatagramEntryPoint, socket, proto, 2048));
 }
 
 // vim: set ts=4 sw=4:
diff --git a/testers/testclient.c b/testers/testclient.c
index 58f0961..d8da697 100644
--- a/testers/testclient.c
+++ b/testers/testclient.c
@@ -27,18 +27,18 @@ main (int argc, char * argv[])
 #endif
 	TR_SimpleClient    client;
 	TR_Protocol        protocol;
-	TR_ProtoMessageRaw message;
+	volatile TR_ProtoMessageRaw message;
 	int                i, j=0;
 
 	TR_logger  = TR_INSTANCE_CAST(TR_Logger, mylogger2);
 	protocol   = TR_new(TR_ProtocolRaw);
 #if UDP
 	socket     = TR_new(TR_UdpSocket, TR_logger, "127.0.0.1", 5678, 0);
-	connection = TR_new(TR_DatagramService, socket, protocol);
+	connection = TR_new(TR_DatagramService, socket, protocol, 2048);
 	TR_socketOpen((TR_Socket)socket);
 #else
 	socket     = TR_new(TR_TcpSocket, TR_logger, "127.0.0.1", 5678, 0);
-	connection = TR_new(TR_Connection, socket, protocol);
+	connection = TR_new(TR_Connection, socket, protocol, 2048);
 	TR_socketConnect((TR_Socket)socket);
 #endif