diff --git a/include/hfsm2/detail/structure/composite.hpp b/include/hfsm2/detail/structure/composite.hpp
index 57fa38f..b08c702 100644
--- a/include/hfsm2/detail/structure/composite.hpp
+++ b/include/hfsm2/detail/structure/composite.hpp
@@ -84,7 +84,7 @@ struct _C {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#if defined _MSC_VER || defined __clang__
+#if defined _MSC_VER || defined __clang_major__ && __clang_major__ >= 7
 
 	template <RegionStrategy TG = STRATEGY>
 	HFSM_INLINE UProng deepRequestChange			 (Control& control,	const ShortIndex = INVALID_SHORT_INDEX);
@@ -110,7 +110,7 @@ struct _C {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#if defined _MSC_VER || defined __clang__
+#if defined _MSC_VER || defined __clang_major__ && __clang_major__ >= 7
 
 	template <RegionStrategy TG = STRATEGY>
 	HFSM_INLINE UProng deepReportChange				 (Control& control,	const ShortIndex = INVALID_SHORT_INDEX);
diff --git a/include/hfsm2/detail/structure/composite.inl b/include/hfsm2/detail/structure/composite.inl
index ae043f9..54fd185 100644
--- a/include/hfsm2/detail/structure/composite.inl
+++ b/include/hfsm2/detail/structure/composite.inl
@@ -254,7 +254,7 @@ _C<NS, NC, NO, TA, TG, TH, TS...>::deepRequest(Control& control,
 
 //------------------------------------------------------------------------------
 
-#if !defined _MSC_VER && !defined __clang__
+#if !defined _MSC_VER && (!defined __clang_major__ || __clang_major__ < 7)
 
 template <StateID NS, ShortIndex NC, ShortIndex NO, typename TA, RegionStrategy TG, typename TH, typename... TS>
 UProng
@@ -324,7 +324,7 @@ _C<NS, NC, NO, TA, TG, TH, TS...>::deepRequestChangeUtilitarian(Control& control
 
 //------------------------------------------------------------------------------
 
-#if !defined _MSC_VER && !defined __clang__
+#if !defined _MSC_VER && (!defined __clang_major__ || __clang_major__ < 7)
 
 template <StateID NS, ShortIndex NC, ShortIndex NO, typename TA, RegionStrategy TG, typename TH, typename... TS>
 UProng
diff --git a/include/hfsm2/detail/structure/composite_sub.hpp b/include/hfsm2/detail/structure/composite_sub.hpp
index bee5eb4..dcac693 100644
--- a/include/hfsm2/detail/structure/composite_sub.hpp
+++ b/include/hfsm2/detail/structure/composite_sub.hpp
@@ -86,7 +86,7 @@ struct _CS {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#if defined _MSC_VER || defined __clang__
+#if defined _MSC_VER || defined __clang_major__ && __clang_major__ >= 7
 
 	template <RegionStrategy TG = STRATEGY>
 	HFSM_INLINE UProng deepRequestChange			 (Control& control,	const ShortIndex = INVALID_SHORT_INDEX);
@@ -112,7 +112,7 @@ struct _CS {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#if defined _MSC_VER || defined __clang__
+#if defined _MSC_VER || defined __clang_major__ && __clang_major__ >= 7
 
 	template <RegionStrategy TG = STRATEGY>
 	HFSM_INLINE UProng deepReportChange				 (Control& control,	const ShortIndex = INVALID_SHORT_INDEX);
diff --git a/include/hfsm2/detail/structure/composite_sub.inl b/include/hfsm2/detail/structure/composite_sub.inl
index 64f6dc4..c2252f7 100644
--- a/include/hfsm2/detail/structure/composite_sub.inl
+++ b/include/hfsm2/detail/structure/composite_sub.inl
@@ -167,7 +167,7 @@ _CS<NS, NC, NO, TA, TG, NI, TS...>::deepForwardRequest(Control& control,
 
 //------------------------------------------------------------------------------
 
-#if !defined _MSC_VER && !defined __clang__
+#if !defined _MSC_VER && (!defined __clang_major__ || __clang_major__ < 7)
 
 template <StateID NS, ShortIndex NC, ShortIndex NO, typename TA, RegionStrategy TG, ShortIndex NI, typename... TS>
 UProng
@@ -235,7 +235,7 @@ _CS<NS, NC, NO, TA, TG, NI, TS...>::deepRequestChangeUtilitarian(Control& contro
 
 //------------------------------------------------------------------------------
 
-#if !defined _MSC_VER && !defined __clang__
+#if !defined _MSC_VER && (!defined __clang_major__ || __clang_major__ < 7)
 
 template <StateID NS, ShortIndex NC, ShortIndex NO, typename TA, RegionStrategy TG, ShortIndex NI, typename... TS>
 UProng
diff --git a/include/hfsm2/machine.hpp b/include/hfsm2/machine.hpp
index 32bfbcf..abb571c 100644
--- a/include/hfsm2/machine.hpp
+++ b/include/hfsm2/machine.hpp
@@ -5249,7 +5249,7 @@ struct _CS {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#if defined _MSC_VER || defined __clang__
+#if defined _MSC_VER || defined __clang_major__ && __clang_major__ >= 7
 
 	template <RegionStrategy TG = STRATEGY>
 	HFSM_INLINE UProng deepRequestChange			 (Control& control,	const ShortIndex = INVALID_SHORT_INDEX);
@@ -5275,7 +5275,7 @@ struct _CS {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#if defined _MSC_VER || defined __clang__
+#if defined _MSC_VER || defined __clang_major__ && __clang_major__ >= 7
 
 	template <RegionStrategy TG = STRATEGY>
 	HFSM_INLINE UProng deepReportChange				 (Control& control,	const ShortIndex = INVALID_SHORT_INDEX);
@@ -5501,7 +5501,7 @@ _CS<NS, NC, NO, TA, TG, NI, TS...>::deepForwardRequest(Control& control,
 
 //------------------------------------------------------------------------------
 
-#if !defined _MSC_VER && !defined __clang__
+#if !defined _MSC_VER && (!defined __clang_major__ || __clang_major__ < 7)
 
 template <StateID NS, ShortIndex NC, ShortIndex NO, typename TA, RegionStrategy TG, ShortIndex NI, typename... TS>
 UProng
@@ -5569,7 +5569,7 @@ _CS<NS, NC, NO, TA, TG, NI, TS...>::deepRequestChangeUtilitarian(Control& contro
 
 //------------------------------------------------------------------------------
 
-#if !defined _MSC_VER && !defined __clang__
+#if !defined _MSC_VER && (!defined __clang_major__ || __clang_major__ < 7)
 
 template <StateID NS, ShortIndex NC, ShortIndex NO, typename TA, RegionStrategy TG, ShortIndex NI, typename... TS>
 UProng
@@ -5809,7 +5809,7 @@ struct _C {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#if defined _MSC_VER || defined __clang__
+#if defined _MSC_VER || defined __clang_major__ && __clang_major__ >= 7
 
 	template <RegionStrategy TG = STRATEGY>
 	HFSM_INLINE UProng deepRequestChange			 (Control& control,	const ShortIndex = INVALID_SHORT_INDEX);
@@ -5835,7 +5835,7 @@ struct _C {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#if defined _MSC_VER || defined __clang__
+#if defined _MSC_VER || defined __clang_major__ && __clang_major__ >= 7
 
 	template <RegionStrategy TG = STRATEGY>
 	HFSM_INLINE UProng deepReportChange				 (Control& control,	const ShortIndex = INVALID_SHORT_INDEX);
@@ -6149,7 +6149,7 @@ _C<NS, NC, NO, TA, TG, TH, TS...>::deepRequest(Control& control,
 
 //------------------------------------------------------------------------------
 
-#if !defined _MSC_VER && !defined __clang__
+#if !defined _MSC_VER && (!defined __clang_major__ || __clang_major__ < 7)
 
 template <StateID NS, ShortIndex NC, ShortIndex NO, typename TA, RegionStrategy TG, typename TH, typename... TS>
 UProng
@@ -6219,7 +6219,7 @@ _C<NS, NC, NO, TA, TG, TH, TS...>::deepRequestChangeUtilitarian(Control& control
 
 //------------------------------------------------------------------------------
 
-#if !defined _MSC_VER && !defined __clang__
+#if !defined _MSC_VER && (!defined __clang_major__ || __clang_major__ < 7)
 
 template <StateID NS, ShortIndex NC, ShortIndex NO, typename TA, RegionStrategy TG, typename TH, typename... TS>
 UProng
diff --git a/projects/visual-studio/shared-15.props b/projects/visual-studio/shared-15.props
index e879e62..8ae3ce0 100644
--- a/projects/visual-studio/shared-15.props
+++ b/projects/visual-studio/shared-15.props
@@ -3,8 +3,8 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>$(SolutionDir)..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)..\..\binaries-$(PlatformTarget)\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformTarget)\$(ProjectName)-$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformTarget)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>