diff --git a/cde/programs/dtfile/FileOp.c b/cde/programs/dtfile/FileOp.c
index ff7f2b1ac..67afc0def 100644
--- a/cde/programs/dtfile/FileOp.c
+++ b/cde/programs/dtfile/FileOp.c
@@ -1971,7 +1971,7 @@ FileOpPipeCB(
 
          if( cb_data->mode == MOVE_FILE )
          {
-           sprintf( fileName, "%s/%s", tmpDir, cb_data->updates[i].file );
+           snprintf( fileName, sizeof(fileName), "%s/%s", tmpDir, cb_data->updates[i].file );
            if( cb_data->updates[i].operationStatus == True )
            {
              if( status == PIPEMSG_MOVE_TO_SAME_DIR )
@@ -1988,7 +1988,7 @@ FileOpPipeCB(
 
 	       if(initiating_view == NULL && cb_data->callback_data == NULL)
 	       {
-                 sprintf( fileName, "%s/%s", cb_data->directory,
+                 snprintf( fileName, sizeof(fileName), "%s/%s", cb_data->directory,
 			      cb_data->updates[i].file );
                  DtEliminateDots(fileName);
                  RemoveIconFromWorkspace( fileName, cb_data->directory );
diff --git a/cde/programs/dtfile/fsDialog.c b/cde/programs/dtfile/fsDialog.c
index 3e34a2c07..9817fd3ca 100644
--- a/cde/programs/dtfile/fsDialog.c
+++ b/cde/programs/dtfile/fsDialog.c
@@ -119,7 +119,7 @@
  *   global variables
  *----------------------*/
 
-#define EMSGMAX 1024
+#define EMSGMAX 4096
 char g_errorMessage[EMSGMAX];