diff --git a/lib/base/netstring.cpp b/lib/base/netstring.cpp
index 60f08c265..392b96511 100644
--- a/lib/base/netstring.cpp
+++ b/lib/base/netstring.cpp
@@ -127,7 +127,7 @@ size_t NetString::WriteStringToStream(const Stream::Ptr& stream, const String& s
  * @see https://github.com/PeterScott/netstring-c/blob/master/netstring.c
  */
 String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
-	ssize_t maxMessageLength)
+	size_t maxMessageLength)
 {
 	namespace asio = boost::asio;
 
@@ -167,7 +167,7 @@ String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
 		}
 	}
 
-	if (maxMessageLength >= 0 && len > maxMessageLength) {
+	if (len > maxMessageLength) {
 		std::stringstream errorMessage;
 		errorMessage << "Max data length exceeded: " << (maxMessageLength / 1024) << " KB";
 
@@ -206,7 +206,7 @@ String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
  * @see https://github.com/PeterScott/netstring-c/blob/master/netstring.c
  */
 String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
-	boost::asio::yield_context yc, ssize_t maxMessageLength)
+	boost::asio::yield_context yc, size_t maxMessageLength)
 {
 	namespace asio = boost::asio;
 
@@ -246,7 +246,7 @@ String NetString::ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
 		}
 	}
 
-	if (maxMessageLength >= 0 && len > maxMessageLength) {
+	if (len > maxMessageLength) {
 		std::stringstream errorMessage;
 		errorMessage << "Max data length exceeded: " << (maxMessageLength / 1024) << " KB";
 
diff --git a/lib/base/netstring.hpp b/lib/base/netstring.hpp
index e5ec051de..4adbd66e5 100644
--- a/lib/base/netstring.hpp
+++ b/lib/base/netstring.hpp
@@ -26,9 +26,9 @@ class NetString
 public:
 	static StreamReadStatus ReadStringFromStream(const Stream::Ptr& stream, String *message, StreamReadContext& context,
 		bool may_wait = false, ssize_t maxMessageLength = -1);
-	static String ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream, ssize_t maxMessageLength = -1);
+	static String ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream, size_t maxMessageLength = -1);
 	static String ReadStringFromStream(const Shared<AsioTlsStream>::Ptr& stream,
-		boost::asio::yield_context yc, ssize_t maxMessageLength = -1);
+		boost::asio::yield_context yc, size_t maxMessageLength = -1);
 	static size_t WriteStringToStream(const Stream::Ptr& stream, const String& message);
 	static size_t WriteStringToStream(const Shared<AsioTlsStream>::Ptr& stream, const String& message);
 	static size_t WriteStringToStream(const Shared<AsioTlsStream>::Ptr& stream, const String& message, boost::asio::yield_context yc);
diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp
index 40580a358..f3748728d 100644
--- a/lib/icingadb/icingadb-objects.cpp
+++ b/lib/icingadb/icingadb-objects.cpp
@@ -542,7 +542,7 @@ void IcingaDB::UpdateAllConfigObjects()
 		<< "Initial config/status dump finished in " << took << " seconds.";
 }
 
-std::vector<std::vector<intrusive_ptr<ConfigObject>>> IcingaDB::ChunkObjects(std::vector<intrusive_ptr<ConfigObject>> objects, size_t chunkSize) {
+std::vector<std::vector<intrusive_ptr<ConfigObject>>> IcingaDB::ChunkObjects(std::vector<intrusive_ptr<ConfigObject>> objects, int chunkSize) {
 	std::vector<std::vector<intrusive_ptr<ConfigObject>>> chunks;
 	auto offset (objects.begin());
 	auto end (objects.end());
diff --git a/lib/icingadb/icingadb.hpp b/lib/icingadb/icingadb.hpp
index af58a977d..0b242bc97 100644
--- a/lib/icingadb/icingadb.hpp
+++ b/lib/icingadb/icingadb.hpp
@@ -106,7 +106,7 @@ private:
 
 	/* config & status dump */
 	void UpdateAllConfigObjects();
-	std::vector<std::vector<intrusive_ptr<ConfigObject>>> ChunkObjects(std::vector<intrusive_ptr<ConfigObject>> objects, size_t chunkSize);
+	std::vector<std::vector<intrusive_ptr<ConfigObject>>> ChunkObjects(std::vector<intrusive_ptr<ConfigObject>> objects, int chunkSize);
 	void DeleteKeys(const RedisConnection::Ptr& conn, const std::vector<String>& keys, RedisConnection::QueryPriority priority);
 	std::vector<String> GetTypeOverwriteKeys(const String& type);
 	std::vector<String> GetTypeDumpSignalKeys(const Type::Ptr& type);