diff --git a/components/finsh/shell.c b/components/finsh/shell.c
index bede44329bfe8cef5e5b32d987812e521e593318..9fcfdd71f0735aec9c8079ee673224d5008dd55c 100644
--- a/components/finsh/shell.c
+++ b/components/finsh/shell.c
@@ -166,7 +166,7 @@ const char* finsh_get_device()
 void finsh_set_echo(rt_uint32_t echo)
 {
 	RT_ASSERT(shell != RT_NULL);
-	shell->echo_mode = echo;
+	shell->echo_mode = (rt_uint8_t)echo;
 }
 
 /**
diff --git a/components/finsh/shell.h b/components/finsh/shell.h
index 52def9c9d46bfd8c43466cdbabd4250c592bea62..19d2c8c717d890ac365337f7dd4afc146b933ad5 100644
--- a/components/finsh/shell.h
+++ b/components/finsh/shell.h
@@ -57,7 +57,7 @@ struct finsh_shell
 	rt_uint8_t use_history:1;
 
 #ifdef FINSH_USING_HISTORY
-	rt_uint8_t current_history;
+	rt_uint16_t current_history;
 	rt_uint16_t history_count;
 
 	char cmd_history[FINSH_HISTORY_LINES][FINSH_CMD_SIZE];
diff --git a/components/init/components.h b/components/init/components.h
index 9feb508f9eb1120d0f9048d81249050c4278b322..c19813da3a4da71c88418c6a4d28d3b6d2aebaf7 100644
--- a/components/init/components.h
+++ b/components/init/components.h
@@ -31,10 +31,11 @@ extern void lwip_system_init(void);
 
 #ifdef RT_USING_DFS
 #include <dfs_init.h>
+#include <dfs_fs.h>
 #ifdef RT_USING_DFS_ELMFAT
 #include <dfs_elm.h>
 #endif
-#ifdef RT_USING_DFS_NFS
+#if defined(RT_USING_LWIP) && defined(RT_USING_DFS_NFS)
 #include <dfs_nfs.h>
 #endif
 #ifdef RT_USING_DFS_ROMFS