diff --git a/source/lib/sysdep/win/wsdl.cpp b/source/lib/sysdep/win/wsdl.cpp
index b541167024..6e4170b8a0 100755
--- a/source/lib/sysdep/win/wsdl.cpp
+++ b/source/lib/sysdep/win/wsdl.cpp
@@ -660,7 +660,9 @@ keep:
 		return 0;
 	}
 
-	hWnd = CreateWindowEx(0, (LPCSTR)class_atom, APP_NAME, WS_POPUP|WS_VISIBLE, 0, 0, w, h, 0, 0, hInst, 0);
+	DWORD windowStyle = fullscreen ? (WS_POPUP|WS_VISIBLE) : (WS_CAPTION | WS_POPUPWINDOW | WS_VISIBLE);
+
+	hWnd = CreateWindowEx(0, (LPCSTR)class_atom, APP_NAME, windowStyle, 0, 0, w, h, 0, 0, hInst, 0);
 	if(!hWnd)
 		return 0;
 
diff --git a/source/main.cpp b/source/main.cpp
index e17a423c4e..932e58f2e4 100755
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1546,8 +1546,6 @@ void ScEd_Init()
 void ScEd_Shutdown()
 {
 	Shutdown();
-
-	delete &g_Profiler;
 }
 
 #endif // SCED
diff --git a/source/tools/sced/EditorData.cpp b/source/tools/sced/EditorData.cpp
index 6e35661178..655fc69693 100755
--- a/source/tools/sced/EditorData.cpp
+++ b/source/tools/sced/EditorData.cpp
@@ -26,6 +26,7 @@
 #include "XML.h"
 
 #include "Game.h"
+#include "GameAttributes.h"
 
 const int NUM_ALPHA_MAPS = 14;
 Handle AlphaMaps[NUM_ALPHA_MAPS];
diff --git a/source/tools/sced/ui/TexToolsDlgBar.cpp b/source/tools/sced/ui/TexToolsDlgBar.cpp
index f23f182714..f6df1cbcd0 100755
--- a/source/tools/sced/ui/TexToolsDlgBar.cpp
+++ b/source/tools/sced/ui/TexToolsDlgBar.cpp
@@ -95,12 +95,12 @@ static void ConvertColor(const Color8888* src,Color888* dst)
 	dst->b=src->b;
 }
 
-CTerrainTypeGroup *CTexToolsDlgBar::GetCurrentTerrainType()
+CTerrainGroup *CTexToolsDlgBar::GetCurrentTerrainType()
 {
 	CComboBox* terraintypes=(CComboBox*) GetDlgItem(IDC_COMBO_TERRAINTYPES);
 	int nIndex=terraintypes->GetCurSel();
 	if (nIndex != CB_ERR)
-		return (CTerrainTypeGroup *)terraintypes->GetItemDataPtr(nIndex);
+		return (CTerrainGroup *)terraintypes->GetItemDataPtr(nIndex);
 	else
 		return NULL;
 }
@@ -200,8 +200,8 @@ BOOL CTexToolsDlgBar::OnInitDialog()
 	// build combo box for terrain types
 	CComboBox* terraintypes=(CComboBox*) GetDlgItem(IDC_COMBO_TERRAINTYPES);
 	
-	const CTextureManager::TerrainTypeGroupMap &ttypes=g_TexMan.GetGroups();
-	CTextureManager::TerrainTypeGroupMap::const_iterator it;
+	const CTextureManager::TerrainGroupMap &ttypes=g_TexMan.GetGroups();
+	CTextureManager::TerrainGroupMap::const_iterator it;
 	for (it=ttypes.begin();it!=ttypes.end();++it) {
 		int nIndex=terraintypes->AddString(it->second->GetName().c_str());
 		if (nIndex != CB_ERR)
diff --git a/source/tools/sced/ui/TexToolsDlgBar.h b/source/tools/sced/ui/TexToolsDlgBar.h
index 09ce9d5793..67f8109b2d 100755
--- a/source/tools/sced/ui/TexToolsDlgBar.h
+++ b/source/tools/sced/ui/TexToolsDlgBar.h
@@ -17,7 +17,7 @@ public:
 protected:
 	CImageList m_ImageList;
 
-	CTerrainTypeGroup *GetCurrentTerrainType();
+	CTerrainGroup *GetCurrentTerrainType();
 
 	void Select(CTextureEntry* entry);
 	BOOL BuildImageListIcon(CTextureEntry* texentry);