diff --git a/src/cmscgats.c b/src/cmscgats.c
index 15210f24..c37de766 100644
--- a/src/cmscgats.c
+++ b/src/cmscgats.c
@@ -486,13 +486,13 @@ cmsBool BuildAbsolutePath(const char *relPath, const char *basePath, char *buffe
     // Already absolute?
     if (isabsolutepath(relPath)) {
 
-        strncpy(buffer, relPath, MaxLen);
+        memcpy(buffer, relPath, MaxLen);
         buffer[MaxLen-1] = 0;
         return TRUE;
     }
 
     // No, search for last
-    strncpy(buffer, basePath, MaxLen);
+    memcpy(buffer, basePath, MaxLen);
     buffer[MaxLen-1] = 0;
 
     tail = strrchr(buffer, DIR_CHAR);
diff --git a/src/cmsps2.c b/src/cmsps2.c
index aa473b6d..70e4ea8d 100644
--- a/src/cmsps2.c
+++ b/src/cmsps2.c
@@ -752,9 +752,7 @@ int EmitCIEBasedDEF(cmsIOHANDLER* m, cmsPipeline* Pipeline, cmsUInt32Number Inte
     const char* PostMaj;
     const char* PreMin, *PostMin;
     cmsStage* mpe;
-    
-    static char buffer[2048];
-
+        
     mpe = Pipeline->Elements;
 
     switch (cmsStageInputChannels(mpe)) {