diff --git a/src/config.cpp b/src/config.cpp
index 4dcb729..3199669 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -268,7 +268,7 @@ std::vector<SockEndpoint> parseAddresses(const std::vector<std::string>& addrs,
     return ret;
 }
 
-void printAddresses(std::vector<std::string>& out, std::vector<SockEndpoint>& inp)
+void printAddresses(std::vector<std::string>& out, const std::vector<SockEndpoint>& inp)
 {
     std::vector<std::string> temp;
     temp.reserve(inp.size());
@@ -512,7 +512,7 @@ void Config::expand()
             } else if(evsocket::ipstack!=evsocket::Linsock) {
                 /* Other IP stacks allow binding different sockets.
                  * OSX has the added oddity of ordering dependence.
-                 * 0.0.0.0 and the :: is allowed, but not the reverse.
+                 * 0.0.0.0 and then :: is allowed, but not the reverse.
                  *
                  * So when possible, we always bind both in the allowed order.
                  */
diff --git a/src/serverconn.cpp b/src/serverconn.cpp
index 978ebcd..795f07d 100644
--- a/src/serverconn.cpp
+++ b/src/serverconn.cpp
@@ -408,7 +408,10 @@ ServIface::ServIface(const SockAddr &addr, server::Server::Pvt *server, bool fal
                 fallback = false;
                 continue;
             }
-            log_err_printf(connsetup, "Bind to %s fails\n", bind_addr.tostring().c_str());
+            log_err_printf(connsetup, "Bind to %s fails%s with %d\n",
+                           bind_addr.tostring().c_str(),
+                           fallback ? "" : " after fallback",
+                           e.code().value());
             throw;
         }
         break;
diff --git a/src/udp_collector.cpp b/src/udp_collector.cpp
index 231e0d7..960ae68 100644
--- a/src/udp_collector.cpp
+++ b/src/udp_collector.cpp
@@ -339,7 +339,7 @@ void UDPCollector::process_one(const SockAddr &dest, const uint8_t *buf, size_t
             from_wire(M, prot);
             if(prot=="tcp") {
                 protoTCP = true;
-            } else {
+            } else if(!prot.empty()) {
                 otherproto.push_back(prot);
             }
         }