diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index 64a9d5df82c..f314f772d17 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -153,6 +153,7 @@ EditorFileSystemDirectory::EditorFileSystemDirectory() {
 
 	modified_time = 0;
 	parent = NULL;
+	verified = false;
 }
 
 EditorFileSystemDirectory::~EditorFileSystemDirectory() {
@@ -1040,7 +1041,10 @@ bool EditorFileSystem::_find_file(const String &p_file, EditorFileSystemDirector
 		if (idx == -1) {
 			//does not exist, create i guess?
 			EditorFileSystemDirectory *efsd = memnew(EditorFileSystemDirectory);
+
 			efsd->name = path[i];
+			efsd->parent = fs;
+
 			int idx2 = 0;
 			for (int j = 0; j < fs->get_subdir_count(); j++) {
 
@@ -1421,6 +1425,7 @@ EditorFileSystem::EditorFileSystem() {
 
 	singleton = this;
 	filesystem = memnew(EditorFileSystemDirectory); //like, empty
+	filesystem->parent = NULL;
 
 	thread = NULL;
 	scanning = false;
@@ -1429,7 +1434,9 @@ EditorFileSystem::EditorFileSystem() {
 	thread_sources = NULL;
 	new_filesystem = NULL;
 
+	abort_scan = false;
 	scanning_changes = false;
+	scanning_changes_done = false;
 	ResourceSaver::set_save_callback(_resource_saved);
 
 	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h
index b5d61d47d3c..3522a1ab1dc 100644
--- a/editor/editor_file_system.h
+++ b/editor/editor_file_system.h
@@ -168,8 +168,6 @@ class EditorFileSystem : public Node {
 
 	void _scan_fs_changes(EditorFileSystemDirectory *p_dir, const ScanProgress &p_progress);
 
-	int md_count;
-
 	Set<String> valid_extensions;
 	Set<String> import_extensions;