diff --git a/drivers/net/mmnif.c b/drivers/net/mmnif.c
index cd8e014c..c2c09fa2 100644
--- a/drivers/net/mmnif.c
+++ b/drivers/net/mmnif.c
@@ -757,7 +757,7 @@ err_t mmnif_tx(struct netif* netif, struct pbuf* p)
 	mmnif_write_rx_pending(dest_ip,pending);
 
 	/* and unlock the dest_ip mm_rx_buffer_hdr */
-	mmnif_unlock_rx_hdr(dest_ip);
+//	mmnif_unlock_rx_hdr(dest_ip);
 
 	/* check if there is a space in the queue without overwriting another packet */
 	if ((queued + pending) > MMNIF_RX_QUEUELEN)
@@ -778,7 +778,7 @@ err_t mmnif_tx(struct netif* netif, struct pbuf* p)
 		mmnif_write_rx_buffl(dest_ip, pos, p->payload,p->tot_len);
 
 	/* like above ensure we are the only ones editing the hdr */
-	mmnif_lock_rx_hdr(dest_ip);
+//	mmnif_lock_rx_hdr(dest_ip);
 
 	queued = mmnif_read_rx_queue(dest_ip);
 	pending  = mmnif_read_rx_pending(dest_ip);
diff --git a/kernel/tests.c b/kernel/tests.c
index 2008bf14..6b27f422 100644
--- a/kernel/tests.c
+++ b/kernel/tests.c
@@ -256,7 +256,7 @@ void* client_task(void* e)
 		return;
 	}
 
-        setsockopt( sd, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof( on));
+  //      setsockopt( sd, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof( on));
 
 	kprintf("connecting with socket nr : %d",sd);
 	/* connect to PORT on HOST */