diff --git a/.gitignore b/.gitignore
index 1a720f2c..f1430943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,12 +24,13 @@
 .DS_Store
 board/**/build
 board/**/.settings
-board/*/MDK-ARM/DebugConfig/
+board/*/KEIL/*/DebugConfig/
 board/*/obj/
-board/*/MDK-ARM/Obj/
-board/*/MDK-ARM/RTE/
-board/*/MDK-ARM/*.uvguix.*
-board/*/MDK-ARM/EventRecorderStub.scvd
-board/*/MDK-ARM/*/*.htm
-board/*/MDK-ARM/*/*.build_log.htm
+board/*/KEIL/*/Obj/
+board/*/KEIL/*/RTE/
+board/*/KEIL/*/*.uvguix.*
+board/*/KEIL/*/EventRecorderStub.scvd
+board/*/KEIL/*/*/*.htm
+board/*/KEIL/*/*/*.build_log.htm
 board/**/settings/*
+.vscode
diff --git a/components/fs/fatfs/wrapper/tos_fatfs_vfs.c b/components/fs/fatfs/wrapper/tos_fatfs_vfs.c
index eaa59950..d021e921 100644
--- a/components/fs/fatfs/wrapper/tos_fatfs_vfs.c
+++ b/components/fs/fatfs/wrapper/tos_fatfs_vfs.c
@@ -220,7 +220,7 @@ static int fatfs_readdir(vfs_dir_t *dir, vfs_dirent_t *dirent)
 
     dp = (DIR *)dir->private;
     res = tos_f_readdir(dp, &info);
-    if (res != FR_OK) {
+    if (res != FR_OK || info.fname[0] == 0) {
         return -1;
     }
 
diff --git a/components/fs/fatfs/wrapper/tos_ff.c b/components/fs/fatfs/wrapper/tos_ff.c
index 0c49c4b5..5a7819f4 100644
--- a/components/fs/fatfs/wrapper/tos_ff.c
+++ b/components/fs/fatfs/wrapper/tos_ff.c
@@ -4397,6 +4397,7 @@ FRESULT tos_f_stat (
 
 	/* Get logical drive */
 	res = find_volume(fs, 0);
+	dj.obj.fs = fs;
 	if (res == FR_OK) {
 		INIT_NAMBUF(dj.obj.fs);
 		res = follow_path(&dj, path);	/* Follow the file path */
diff --git a/components/fs/vfs/tos_vfs.c b/components/fs/vfs/tos_vfs.c
index 01352c25..b3e070df 100644
--- a/components/fs/vfs/tos_vfs.c
+++ b/components/fs/vfs/tos_vfs.c
@@ -430,7 +430,7 @@ __API__ vfs_dirent_t *tos_vfs_readdir(VFS_DIR *dirp)
     vfs_dir_t *dir = K_NULL;
     vfs_inode_t *inode = K_NULL;
 
-    if (!dir) {
+    if (!dirp) {
         return K_NULL;
     }