diff --git a/elks/fs/msdos/namei.c b/elks/fs/msdos/namei.c
index 70bfee604..eff871010 100644
--- a/elks/fs/msdos/namei.c
+++ b/elks/fs/msdos/namei.c
@@ -95,9 +95,11 @@ static int FATPROC msdos_find_long(struct inode *dir, const char *name, int len,
 	int i, entry_len, res;
 	off_t dirpos, pos = 0;
 	int nocase = 0;
-	ASYNCIO_REENTRANT char entry_name[14];
-	ASYNCIO_REENTRANT char msdos_name[14];
+	ASYNCIO_REENTRANT char entry_name[MAXNAMLEN];   /* FIXME large stack usage */
+	ASYNCIO_REENTRANT char msdos_name[MAXNAMLEN];   /* FIXME large stack usage */
 
+	if (len > MAXNAMLEN)
+		return -ENOENT;
 	for (i=0; i<len; i++)
 		msdos_name[i] = get_fs_byte(name++);
 
diff --git a/elkscmd/basic/Makefile b/elkscmd/basic/Makefile
index fc922414c..02a0a06f4 100644
--- a/elkscmd/basic/Makefile
+++ b/elkscmd/basic/Makefile
@@ -31,7 +31,7 @@ OBJS += host-8018x.o
 endif
 
 ifeq ($(CONFIG_ARCH_PC98), y)
-OBJS += host-pc98.o intC5-pc98.o
+OBJS += host-pc98.o asm-pc98.o
 endif
 
 HOSTPRGS = hostbasic
diff --git a/elkscmd/basic/intC5-pc98.S b/elkscmd/basic/asm-pc98.S
similarity index 100%
rename from elkscmd/basic/intC5-pc98.S
rename to elkscmd/basic/asm-pc98.S
diff --git a/elkscmd/basic/basic.c b/elkscmd/basic/basic.c
index f8262a2e2..456f21867 100644
--- a/elkscmd/basic/basic.c
+++ b/elkscmd/basic/basic.c
@@ -2020,7 +2020,7 @@ int parseLoadSaveCmd() {
     if (executeMode) {
         if (gotFileName) {
             char fileName[MAX_PATH_LEN];
-            if (strlen(stackGetStr()) >= MAX_IDENT_LEN)
+            if (strlen(stackGetStr()) > MAX_PATH_LEN-1)
                 return ERROR_BAD_PARAMETER;
             strcpy(fileName, stackPopStr());
 #if DISK_FUNCTIONS
diff --git a/elkscmd/basic/snakcga.bas b/elkscmd/basic/snakecga.bas
similarity index 100%
rename from elkscmd/basic/snakcga.bas
rename to elkscmd/basic/snakecga.bas