diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 87e05e8a..20ab1223 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -698,7 +698,7 @@
 
 #if GLM_HAS_CONSTEXPR || GLM_HAS_CONSTEXPR_PARTIAL
 #	define GLM_CONSTEXPR constexpr
-#	if GLM_COMPILER & GLM_COMPILER_VC // Visual C++ has a bug #594 https://github.com/g-truc/glm/issues/594
+#	if ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER <= GLM_COMPILER_VC14)) // Visual C++ has a bug #594 https://github.com/g-truc/glm/issues/594
 #		define GLM_CONSTEXPR_CTOR
 #	else
 #		define GLM_CONSTEXPR_CTOR constexpr
diff --git a/glm/detail/type_vec4_simd.inl b/glm/detail/type_vec4_simd.inl
index 8b045a52..084e7ff2 100644
--- a/glm/detail/type_vec4_simd.inl
+++ b/glm/detail/type_vec4_simd.inl
@@ -339,20 +339,6 @@ namespace detail
 	};
 }//namespace detail
 
-#	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template<>
-		GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_lowp>::vec()
-		{}
-
-		template<>
-		GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_mediump>::vec()
-		{}
-
-		template<>
-		GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_highp>::vec()
-		{}
-#	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
-
 	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_lowp>::vec(float _s) :
 		data(_mm_set1_ps(_s))
diff --git a/glm/gtx/quaternion.inl b/glm/gtx/quaternion.inl
index 3abf502c..aa71634b 100644
--- a/glm/gtx/quaternion.inl
+++ b/glm/gtx/quaternion.inl
@@ -228,7 +228,7 @@ namespace glm
 	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> quatLookAtRH(vec<3, T, P> const& direction, vec<3, T, P> const& up)
 	{
-		tmat3x3<T, P> Result;
+		mat<3, 3, T, P> Result;
 
 		Result[2] = -normalize(direction);
 		Result[0] = normalize(cross(up, Result[2]));
@@ -240,7 +240,7 @@ namespace glm
 	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> quatLookAtLH(vec<3, T, P> const& direction, vec<3, T, P> const& up)
 	{
-		tmat3x3<T, P> Result;
+		mat<3, 3, T, P> Result;
 
 		Result[2] = normalize(direction);
 		Result[0] = normalize(cross(up, Result[2]));