diff --git a/Import/GacUIReflection.cpp b/Import/GacUIReflection.cpp
index 8c5d44b7..1ad5ccaa 100644
--- a/Import/GacUIReflection.cpp
+++ b/Import/GacUIReflection.cpp
@@ -3580,7 +3580,7 @@ GuiListViewInstanceLoader
 				bool				bindable;
 				GlobalStringKey		_View, _IconSize;
 
-				void PrepareAdditionalArgumentsAfterCreation(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors, Ptr<WfBlockStatement> block)override
+				void PrepareAdditionalArgumentsAfterCreation(const typename BASE_TYPE::TypeInfo& typeInfo, GlobalStringKey variableName, typename BASE_TYPE::ArgumentMap& arguments, collections::List<WString>& errors, Ptr<WfBlockStatement> block)override
 				{
 					auto view = ListViewViewType::Detail;
 					Ptr<WfExpression> iconSize;
@@ -3667,16 +3667,16 @@ GuiListViewInstanceLoader
 					_IconSize = GlobalStringKey::Get(L"IconSize");
 				}
 
-				void GetConstructorParameters(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
+				void GetConstructorParameters(const typename BASE_TYPE::TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
 				{
-					if (typeInfo.typeName == GetTypeName())
+					if (typeInfo.typeName == BASE_TYPE::GetTypeName())
 					{
 						propertyNames.Add(_View);
 						propertyNames.Add(_IconSize);
 					}
 				}
 
-				Ptr<GuiInstancePropertyInfo> GetPropertyType(const PropertyInfo& propertyInfo)override
+				Ptr<GuiInstancePropertyInfo> GetPropertyType(const typename BASE_TYPE::PropertyInfo& propertyInfo)override
 				{
 					if (propertyInfo.propertyName == _View)
 					{
@@ -3758,7 +3758,7 @@ GuiTreeViewInstanceLoader
 				bool				bindable;
 				GlobalStringKey		_Nodes, _IconSize;
 
-				void PrepareAdditionalArgumentsAfterCreation(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors, Ptr<WfBlockStatement> block)override
+				void PrepareAdditionalArgumentsAfterCreation(const typename BASE_TYPE::TypeInfo& typeInfo, GlobalStringKey variableName, typename BASE_TYPE::ArgumentMap& arguments, collections::List<WString>& errors, Ptr<WfBlockStatement> block)override
 				{
 					vint indexIconSize = arguments.Keys().IndexOf(_IconSize);
 					if (indexIconSize != -1)
@@ -3802,7 +3802,7 @@ GuiTreeViewInstanceLoader
 					_IconSize = GlobalStringKey::Get(L"IconSize");
 				}
 
-				void GetPropertyNames(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
+				void GetPropertyNames(const typename BASE_TYPE::TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
 				{
 					if (!bindable)
 					{
@@ -3810,16 +3810,16 @@ GuiTreeViewInstanceLoader
 					}
 				}
 
-				void GetConstructorParameters(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
+				void GetConstructorParameters(const typename BASE_TYPE::TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
 				{
-					if (typeInfo.typeName == GetTypeName())
+					if (typeInfo.typeName == BASE_TYPE::GetTypeName())
 					{
 						propertyNames.Add(_Nodes);
 						propertyNames.Add(_IconSize);
 					}
 				}
 
-				Ptr<GuiInstancePropertyInfo> GetPropertyType(const PropertyInfo& propertyInfo)override
+				Ptr<GuiInstancePropertyInfo> GetPropertyType(const typename BASE_TYPE::PropertyInfo& propertyInfo)override
 				{
 					if (propertyInfo.propertyName == _Nodes)
 					{
@@ -3837,7 +3837,7 @@ GuiTreeViewInstanceLoader
 					return IGuiInstanceLoader::GetPropertyType(propertyInfo);
 				}
 
-				Ptr<workflow::WfStatement> AssignParameters(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)override
+				Ptr<workflow::WfStatement> AssignParameters(const typename BASE_TYPE::TypeInfo& typeInfo, GlobalStringKey variableName, typename BASE_TYPE::ArgumentMap& arguments, collections::List<WString>& errors)override
 				{
 					auto block = MakePtr<WfBlockStatement>();
 
@@ -11103,7 +11103,7 @@ WorkflowGenerateCreatingVisitor
 					serializable = true;
 					textValue = text->text;
 				}
-				else if (ctor = dynamic_cast<GuiConstructorRepr*>(repr))
+				else if ((ctor = dynamic_cast<GuiConstructorRepr*>(repr)))
 				{
 					if (ctor->instanceName == GlobalStringKey::Empty)
 					{
diff --git a/Import/GacUIWindows.cpp b/Import/GacUIWindows.cpp
index a23119f4..a96c6cd0 100644
--- a/Import/GacUIWindows.cpp
+++ b/Import/GacUIWindows.cpp
@@ -1723,7 +1723,6 @@ NATIVEWINDOW\WINDOWS\DIRECT2D\WINDIRECT2DAPPLICATION.CPP
 #pragma comment(lib, "dwrite.lib")
 #pragma comment(lib, "d3d11.lib")
 
-#include <d3d11_1.h>
 
 namespace vl
 {
@@ -2174,6 +2173,11 @@ ControllerListener
 			{
 				return direct2DListener->dwrite.Obj();
 			}
+
+			ID3D11Device* GetD3D11Device()
+			{
+				return direct2DListener->d3d11Device.Obj();
+			}
 		}
 
 		namespace elements_windows_d2d
diff --git a/Import/GacUIWindows.h b/Import/GacUIWindows.h
index 117ac277..576e491b 100644
--- a/Import/GacUIWindows.h
+++ b/Import/GacUIWindows.h
@@ -642,6 +642,7 @@ Interfaces:
 
 #include <d2d1_1.h>
 #include <dwrite_1.h>
+#include <d3d11_1.h>
 
 namespace vl
 {
@@ -654,6 +655,7 @@ namespace vl
 			extern bool									PresentNativeWindowDirect2DRenderTarget(INativeWindow* window);
 			extern ID2D1Factory*						GetDirect2DFactory();
 			extern IDWriteFactory*						GetDirectWriteFactory();
+			extern ID3D11Device*						GetD3D11Device();
 		}
 	}
 }