diff --git a/reactos/subsys/system/explorer/dialogs/searchprogram.cpp b/reactos/subsys/system/explorer/dialogs/searchprogram.cpp
index 365f4ece8a3..3929d059407 100644
--- a/reactos/subsys/system/explorer/dialogs/searchprogram.cpp
+++ b/reactos/subsys/system/explorer/dialogs/searchprogram.cpp
@@ -153,7 +153,7 @@ void FindProgramDlg::Refresh(bool delete_cache)
 
 	TCHAR buffer[1024];
 	GetWindowText(GetDlgItem(_hwnd, IDC_FILTER), buffer, 1024);
-#ifndef __WINE__ ///@todo
+#ifndef __WINE__ ///@todo _tcslwr() for Wine
 	_tcslwr(buffer);
 #endif
 	_lwr_filter = buffer;
@@ -232,7 +232,7 @@ void FindProgramDlg::add_entry(const FPDEntry& cache_entry)
 	String lwr_path = cache_entry._path;
 	String lwr_name = cache_entry._entry->_display_name;
 
-#ifndef __WINE__ ///@todo
+#ifndef __WINE__ ///@todo _tcslwr() for Wine
 	_tcslwr((LPTSTR)lwr_path.c_str());
 	_tcslwr((LPTSTR)lwr_name.c_str());
 #endif
diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp
index 7bb7aeb7978..2b933b9b06d 100644
--- a/reactos/subsys/system/explorer/explorer.cpp
+++ b/reactos/subsys/system/explorer/explorer.cpp
@@ -172,7 +172,7 @@ bool FileTypeManager::is_exe_file(LPCTSTR ext)
 
 const FileTypeInfo& FileTypeManager::operator[](String ext)
 {
-#ifndef __WINE__ ///@todo
+#ifndef __WINE__ ///@todo _tcslwr() for Wine
 	_tcslwr((LPTSTR)ext.c_str());
 #endif
 
@@ -405,7 +405,7 @@ const Icon& IconCache::extract(LPCTSTR path, int idx)
 {
 	CachePair key(path, idx);
 
-#ifndef __WINE__ ///@todo
+#ifndef __WINE__ ///@todo _tcslwr() for Wine
 	_tcslwr((LPTSTR)key.first.c_str());
 #endif
 
diff --git a/reactos/subsys/system/explorer/shell/entries.cpp b/reactos/subsys/system/explorer/shell/entries.cpp
index 20482d31ae2..9ffa3373e38 100644
--- a/reactos/subsys/system/explorer/shell/entries.cpp
+++ b/reactos/subsys/system/explorer/shell/entries.cpp
@@ -116,7 +116,7 @@ Entry* Entry::read_tree(const void* path, SORT_ORDER sortOrder, int scan_flags)
 {
 	CONTEXT("Entry::read_tree()");
 
-	HCURSOR old_cursor = SetCursor(LoadCursor(0, IDC_WAIT));
+	WaitCursor wait;
 
 	Entry* entry = this;
 
@@ -132,8 +132,6 @@ Entry* Entry::read_tree(const void* path, SORT_ORDER sortOrder, int scan_flags)
 		entry = found;
 	}
 
-	SetCursor(old_cursor);
-
 	return entry;
 }
 
diff --git a/reactos/subsys/system/explorer/shell/entries.h b/reactos/subsys/system/explorer/shell/entries.h
index 6754c40feeb..ed1b9aa8992 100644
--- a/reactos/subsys/system/explorer/shell/entries.h
+++ b/reactos/subsys/system/explorer/shell/entries.h
@@ -51,7 +51,7 @@ enum SCAN_FLAGS {
 	SCAN_EXTRACT_ICONS	= 1,
 	SCAN_DO_ACCESS		= 2,
 
-	SCAN_ALL			= 0,//@@3,
+	SCAN_ALL			= 3,
 
 	SCAN_FILESYSTEM		= 4
 };
diff --git a/reactos/subsys/system/explorer/shell/filechild.cpp b/reactos/subsys/system/explorer/shell/filechild.cpp
index 7b928614b22..ac22313aac4 100644
--- a/reactos/subsys/system/explorer/shell/filechild.cpp
+++ b/reactos/subsys/system/explorer/shell/filechild.cpp
@@ -276,7 +276,9 @@ void FileChildWindow::set_curdir(Entry* entry)
 
 			ListBox_ResetContent(_right_hwnd);
 			_right->insert_entries(entry->_down);
-			_right->calc_widths(false);
+
+			_right->calc_widths(false);	///@todo make configurable (This call takes really _very_ long compared to all other processing!)
+
 			_right->set_header();
 		}
 
@@ -601,7 +603,7 @@ void FileChildWindow::activate_entry(Pane* pane)	///@todo enable using <RETURN>
 		}
 
 		if (!scanned_old) {
-			pane->calc_widths(FALSE);
+			pane->calc_widths(false);
 
 			pane->set_header();
 		}