diff --git a/Import/GacUICompiler.cpp b/Import/GacUICompiler.cpp
index f3cea50e..0418234c 100644
--- a/Import/GacUICompiler.cpp
+++ b/Import/GacUICompiler.cpp
@@ -5607,10 +5607,6 @@ GuiTemplateInstanceLoader
 				{
 					List<ITypeDescriptor*> tds;
 					tds.Add(typeInfo.typeDescriptor);
-					if (typeInfo.typeDescriptor == description::GetTypeDescriptor<GuiToolstripButtonTemplate>())
-					{
-						int a = 0;
-					}
 
 					for (vint i = 0; i < tds.Count(); i++)
 					{
diff --git a/Import/GacUIReflection.h b/Import/GacUIReflection.h
index bf58680e..a1a0784d 100644
--- a/Import/GacUIReflection.h
+++ b/Import/GacUIReflection.h
@@ -2182,7 +2182,7 @@ GuiEventInfoImpl
 				{
 				}
 
-				ICpp* GetCpp()override
+				IEventInfo::ICpp* GetCpp()override
 				{
 					return isCompositionEvent ? this : nullptr;
 				}
diff --git a/Import/Vlpp.h b/Import/Vlpp.h
index 7b89718c..c45809b5 100644
--- a/Import/Vlpp.h
+++ b/Import/Vlpp.h
@@ -12031,7 +12031,7 @@ TypeInfoRetriver Helper Functions (BoxValue, UnboxValue)
 			template<typename T>
 			Value BoxValue(const T& object, ITypeDescriptor* typeDescriptor=0)
 			{
-				using Type = RemoveCVR<T>::Type;
+				using Type = typename RemoveCVR<T>::Type;
 				return ValueAccessor<Type, TypeInfoRetriver<Type>::Decorator>::BoxValue(object, typeDescriptor);
 			}
 			
@@ -12044,7 +12044,7 @@ TypeInfoRetriver Helper Functions (BoxValue, UnboxValue)
 			template<typename T>
 			T UnboxValue(const Value& value, ITypeDescriptor* typeDescriptor=0, const WString& valueName=L"value")
 			{
-				using Type = RemoveCVR<T>::Type;
+				using Type = typename RemoveCVR<T>::Type;
 				return ValueAccessor<Type, TypeInfoRetriver<Type>::Decorator>::UnboxValue(value, typeDescriptor, valueName);
 			}
 
diff --git a/Import/VlppWorkflowCompiler.h b/Import/VlppWorkflowCompiler.h
index 0fca3330..934493e0 100644
--- a/Import/VlppWorkflowCompiler.h
+++ b/Import/VlppWorkflowCompiler.h
@@ -1862,7 +1862,7 @@ namespace vl
 	namespace workflow
 	{
 		/// <summary>Print a Workflow attribute.</summary>
-		/// <param name="attribute">The Workflow attribute.</param>
+		/// <param name="node">The Workflow attribute.</param>
 		/// <param name="indent">The indentation.</param>
 		/// <param name="writer">The target writer.</param>
 		extern void			WfPrint(Ptr<WfAttribute> node, const WString& indent, parsing::ParsingWriter& writer);
@@ -1893,7 +1893,7 @@ namespace vl
 		extern void			WfPrint(Ptr<WfModule> node, const WString& indent, parsing::ParsingWriter& writer);
 
 		/// <summary>Print a Workflow attribute.</summary>
-		/// <param name="attribute">The Workflow attribute.</param>
+		/// <param name="node">The Workflow attribute.</param>
 		/// <param name="indent">The indentation.</param>
 		/// <param name="writer">The target writer.</param>
 		extern void			WfPrint(Ptr<WfAttribute> node, const WString& indent, stream::TextWriter& writer);