diff --git a/reactos/subsys/system/explorer/Makefile b/reactos/subsys/system/explorer/Makefile
index 37a9af9d352..cb6c47a41bb 100644
--- a/reactos/subsys/system/explorer/Makefile
+++ b/reactos/subsys/system/explorer/Makefile
@@ -89,7 +89,7 @@ OBJECTS = \
 	quicklaunch.o \
 	settings.o
 
-LIBS = gdi32 comctl32 ole32 uuid wsock32
+LIBS = gdi32 comctl32 ole32 uuid
 
 .PHONY: all depends implib clean install dist bootcd depends
 
diff --git a/reactos/subsys/system/explorer/Makefile.MinGW b/reactos/subsys/system/explorer/Makefile.MinGW
index 10d4789564c..6d6d5bb5b9a 100644
--- a/reactos/subsys/system/explorer/Makefile.MinGW
+++ b/reactos/subsys/system/explorer/Makefile.MinGW
@@ -63,7 +63,7 @@ OBJECTS = \
 	quicklaunch.o \
 	settings.o
 
-LIBS = gdi32 comctl32 ole32 uuid wsock32
+LIBS = gdi32 comctl32 ole32 uuid
 
 all: $(TARGET)
 
diff --git a/reactos/subsys/system/explorer/desktop/desktop.cpp b/reactos/subsys/system/explorer/desktop/desktop.cpp
index 4991e571bfc..432b3027bc2 100644
--- a/reactos/subsys/system/explorer/desktop/desktop.cpp
+++ b/reactos/subsys/system/explorer/desktop/desktop.cpp
@@ -78,11 +78,9 @@ void Desktops::SwitchToDesktop(int idx)
 	if (_current_desktop == idx)
 		return;
 
-	Desktop& desktop = (*this)[idx];
-
-	 // save currently visible application windows
 	Desktop& old_desktop = (*this)[_current_desktop];
 	WindowSet& windows = old_desktop._windows;
+	Desktop& desktop = (*this)[idx];
 
 	windows.clear();
 
@@ -92,6 +90,7 @@ void Desktops::SwitchToDesktop(int idx)
 		for(WindowSet::const_iterator it2=it1->_windows.begin(); it2!=it1->_windows.end(); ++it2)
 			other_wnds.insert(*it2);
 
+	 // save currently visible application windows
 	EnumWindows(SwitchDesktopEnumFct, (LPARAM)&windows);
 
 	old_desktop._hwndForeground = (HWND)SendMessage(g_Globals._hwndDesktopBar, PM_GET_LAST_ACTIVE, 0, 0);
diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
index 36b31524d1a..6c7f323c30e 100644
--- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp
+++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
@@ -1804,6 +1804,6 @@ void RecentStartMenu::AddEntries()
 		}
 
 		dir.sort_directory(SORT_DATE);
-		AddShellEntries(dir, 16, smd._subfolders);	///@todo read max. count of entries from registry
+		AddShellEntries(dir, RECENT_DOCS_COUNT, smd._subfolders);	///@todo read max. count of entries from registry
 	}
 }
diff --git a/reactos/subsys/system/explorer/taskbar/taskbar.cpp b/reactos/subsys/system/explorer/taskbar/taskbar.cpp
index c843dceddda..f42f3ba71e8 100644
--- a/reactos/subsys/system/explorer/taskbar/taskbar.cpp
+++ b/reactos/subsys/system/explorer/taskbar/taskbar.cpp
@@ -69,9 +69,11 @@ HWND TaskBar::Create(HWND hwndParent)
 {
 	ClientRect clnt(hwndParent);
 
+	int taskbar_pos = 80;	// This start position will be adjusted in DesktopBar::Resize().
+
 	return Window::Create(WINDOW_CREATOR(TaskBar), 0,
 							BtnWindowClass(CLASSNAME_TASKBAR), TITLE_TASKBAR, WS_CHILD|WS_VISIBLE,
-							TASKBAR_LEFT, 0, clnt.right-TASKBAR_LEFT-(NOTIFYAREA_WIDTH_DEF+1), clnt.bottom, hwndParent);
+							taskbar_pos, 0, clnt.right-taskbar_pos-(NOTIFYAREA_WIDTH_DEF+1), clnt.bottom, hwndParent);
 }
 
 LRESULT TaskBar::Init(LPCREATESTRUCT pcs)