diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c
index 133858d..0b19f6d 100644
--- a/meshcore/agentcore.c
+++ b/meshcore/agentcore.c
@@ -3845,7 +3845,7 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
 	int ixr = 0;
 	for (ri = 0; ri < paramLen; ++ri)
 	{
-		int len = strnlen_s(param[ri], 4096);
+		int len = (int)strnlen_s(param[ri], 4096);
 		int ix;
 		if ((ix=ILibString_IndexOf(param[ri], len, "=", 1)) > 2 && strncmp(param[ri], "--", 2)==0)
 		{
diff --git a/microstack/ILibSimpleDataStore.c b/microstack/ILibSimpleDataStore.c
index 56cab56..c1f668a 100644
--- a/microstack/ILibSimpleDataStore.c
+++ b/microstack/ILibSimpleDataStore.c
@@ -118,7 +118,7 @@ void ILibSimpleDataStore_Cached(ILibSimpleDataStore dataStore, char* key, int ke
 	if (root->cacheTable == NULL) { root->cacheTable = ILibHashtable_Create(); }
 	ILibSimpleDataStore_CacheEntry *entry = (ILibSimpleDataStore_CacheEntry*)ILibMemory_Allocate(sizeof(ILibSimpleDataStore_CacheEntry) + valueLen, 0, NULL, NULL);
 	entry->valueLength = valueLen;
-	memcpy_s(entry->value, valueLen, value, valueLen);
+	if (valueLen > 0) { memcpy_s(entry->value, valueLen, value, valueLen); }
 	
 	ILibHashtable_Put(root->cacheTable, NULL, key, keyLen, entry);
 }