diff --git a/src/common/config/config.cpp b/src/common/config/config.cpp
index 13b21d31f3..9c67dcf6ab 100644
--- a/src/common/config/config.cpp
+++ b/src/common/config/config.cpp
@@ -450,7 +450,10 @@ int Config::getDummyPacketInterval() const
 
 int Config::getLockMemSize() const
 {
-	return get<int>(KEY_LOCK_MEM_SIZE);
+	int size = get<int>(KEY_LOCK_MEM_SIZE);
+	if (size < 64 * 1024)
+		size = 64 * 1024;
+	return size;
 }
 
 int Config::getLockHashSlots() const
diff --git a/src/common/config/config_file.cpp b/src/common/config/config_file.cpp
index 2f6b7904c9..3366bf8e54 100644
--- a/src/common/config/config_file.cpp
+++ b/src/common/config/config_file.cpp
@@ -795,7 +795,9 @@ SINT64 ConfigFile::Parameter::asInteger() const
 			break;
 
 		case ' ': case '\t':
-			break;
+			if (state == 1)
+				break;
+			return 0;
 
 		case 'k': case 'K':
 			if (state != 2)