diff --git a/Application.cpp b/Application.cpp
index 023558f..4a8ffaa 100644
--- a/Application.cpp
+++ b/Application.cpp
@@ -134,7 +134,7 @@ Application::Application(HWND parentWindow) : _propWindow(NULL) { //: GApp(setti
 	_propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
 	webBrowser = new IEBrowser(_hwndToolbox);
 	
-	SetWindowLongPtr(_hwndToolbox,GWL_USERDATA,(LONG)webBrowser);
+	SetWindowLongPtr(_hwndToolbox,GWL_USERDATA+1,(LONG)webBrowser);
 	//webBrowser->navigateSyncURL(L"http://androdome.com/res/ClientToolbox.php");
 	//navigateToolbox(GetFileInPath("/content/page/controller.html"));
 	navigateToolbox(GetFileInPath("/content/page/surface.html"));
diff --git a/DataModelInstance.cpp b/DataModelInstance.cpp
index 5364ff6..c3a4b25 100644
--- a/DataModelInstance.cpp
+++ b/DataModelInstance.cpp
@@ -452,6 +452,7 @@ bool DataModelInstance::load(const char* filename, bool clearObjects)
 		std::stringstream msg;
 		msg << "Failed to load file:" << std::endl << filename << std::endl << strerror(errno);
 		MessageBoxStr(msg.str());
+		return false;
 	}
 }
 
diff --git a/PartInstance.cpp b/PartInstance.cpp
index 1578823..e71c224 100644
--- a/PartInstance.cpp
+++ b/PartInstance.cpp
@@ -1082,6 +1082,7 @@ static TCHAR* enumStr(int shape)
 		case Enum::Shape::Cylinder:
 			return "Cylinder";
 	}
+	return "Block";
 }
 
 void PartInstance::PropUpdate(LPPROPGRIDITEM &item)
diff --git a/ax.cpp b/ax.cpp
index bc56313..a8f6eba 100644
--- a/ax.cpp
+++ b/ax.cpp
@@ -505,7 +505,7 @@ HRESULT _stdcall AXClientSite :: Invoke(
   EXCEPINFO FAR* pExcepInfo,
   unsigned int FAR* puArgErr)
 {
-	IEBrowser * browser = (IEBrowser *)GetWindowLongPtr(Window,GWL_USERDATA);
+	IEBrowser * browser = (IEBrowser *)GetWindowLongPtr(Window,GWL_USERDATA+1);
 	return browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 	
 	//return S_OK;