diff --git a/node/Constants.hpp b/node/Constants.hpp
index 3445e2613..f9775dd63 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -669,11 +669,7 @@
 /**
  * Desired buffer size for UDP sockets (used in service and osdep but defined here)
  */
-#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__))
 #define ZT_UDP_DESIRED_BUF_SIZE 1048576
-#else
-#define ZT_UDP_DESIRED_BUF_SIZE 131072
-#endif
 
 /**
  * Desired / recommended min stack size for threads (used on some platforms to reset thread stack size)
diff --git a/osdep/LinuxEthernetTap.cpp b/osdep/LinuxEthernetTap.cpp
index 2aba02b63..9306dc34c 100644
--- a/osdep/LinuxEthernetTap.cpp
+++ b/osdep/LinuxEthernetTap.cpp
@@ -277,17 +277,14 @@ LinuxEthernetTap::LinuxEthernetTap(
 							if (_enabled) {
 								_tapq.post(std::pair<void *,int>(buf,r));
 								buf = nullptr;
-								/*
-								to.setTo(getBuf,6);
-								from.setTo(getBuf + 6,6);
-								unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]);
-								_handler(_arg,(void *)0,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14);
-								*/
 							}
 
 							r = 0;
 						}
-					} else break; // return to outer select when read() fails
+					} else {
+						r = 0;
+						break;
+					}
 				}
 			}
 		}
diff --git a/osdep/Phy.hpp b/osdep/Phy.hpp
index 8eb184ba1..8c38d2fae 100644
--- a/osdep/Phy.hpp
+++ b/osdep/Phy.hpp
@@ -351,14 +351,14 @@ public:
 				int tmpbs = bs;
 				if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 					break;
-				bs -= 16384;
+				bs -= 4096;
 			}
 			bs = bufferSize;
 			while (bs >= 65536) {
 				int tmpbs = bs;
 				if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 					break;
-				bs -= 16384;
+				bs -= 4096;
 			}
 		}