diff --git a/DPlusAuthenticator.cpp b/DPlusAuthenticator.cpp
index e73b699..d6f0246 100644
--- a/DPlusAuthenticator.cpp
+++ b/DPlusAuthenticator.cpp
@@ -69,8 +69,7 @@ bool CDPlusAuthenticator::authenticate(const std::string &callsign, std::map<std
 	::memcpy(buffer+28, "W7IB2", 5);
 	::memcpy(buffer+40, "DHS0257", 7);
 
-	int ret = client.write(buffer, 56U);
-	if (ret != 56) {
+	if (client.write(buffer, 56U)) {
 		fprintf(stderr, "ERROR: could not write opening phrase\n");
 		client.close();
 		delete[] buffer;
@@ -119,7 +118,7 @@ bool CDPlusAuthenticator::authenticate(const std::string &callsign, std::map<std
 	}
 
 	printf("Probably authorized DPlus with %s using callsign %s\n", m_address.c_str(), callsign.c_str());
-	printf("Added %lu DPlus gateways\n", gwy_map.size() - sofar);
+	printf("Added %u DPlus gateways\n", (unsigned int)(gwy_map.size() - sofar));
 	client.close();
 
 	delete[] buffer;
diff --git a/TCPReaderWriterClient.cpp b/TCPReaderWriterClient.cpp
index a241c4a..78155de 100644
--- a/TCPReaderWriterClient.cpp
+++ b/TCPReaderWriterClient.cpp
@@ -120,8 +120,8 @@ int CTCPReaderWriterClient::read(unsigned char* buffer, unsigned int length)
 	assert(m_fd != -1);
 
 	ssize_t len = recv(m_fd, buffer, length, 0);
-	if (len < 0) {
-		fprintf(stderr, "Error returned from recv, err=%d\n", errno);
+	if (int(len) != int(length)) {
+		fprintf(stderr, "Error read returned %d from recv, err=%d\n", int(len), errno);
 		return -1;
 	}
 
@@ -157,11 +157,14 @@ bool CTCPReaderWriterClient::write(const unsigned char* buffer, unsigned int len
 
 	ssize_t ret = ::send(m_fd, (char *)buffer, length, 0);
 	if (ret != ssize_t(length)) {
-		fprintf(stderr, "Error returned from send, err=%d\n", errno);
-		return false;
+		if (ret < 0)
+			fprintf(stderr, "Error returned from send, err=%d\n", errno);
+		else
+			fprintf(stderr, "Error only wrote %d of %d bytes\n", int(ret), int(length));
+		return true;
 	}
 
-	return true;
+	return false;
 }
 
 bool CTCPReaderWriterClient::writeLine(const std::string& line)