diff --git a/copying.txt b/copying.txt
index ec06e46e..4ff49c7a 100644
--- a/copying.txt
+++ b/copying.txt
@@ -19,9 +19,8 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
-Restrictions:
- By making use of the Software for military purposes, you choose to make a
- Bunny unhappy.
+Restrictions: By making use of the Software for military purposes, you choose
+to make a Bunny unhappy.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/doc/glm.docx b/doc/glm.docx
index 49e40ebe..7af320d4 100644
Binary files a/doc/glm.docx and b/doc/glm.docx differ
diff --git a/doc/glm.pdf b/doc/glm.pdf
index 2ddc9e87..48520b53 100644
Binary files a/doc/glm.pdf and b/doc/glm.pdf differ
diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp
index 88954e85..44e43426 100644
--- a/glm/detail/type_vec4.hpp
+++ b/glm/detail/type_vec4.hpp
@@ -53,9 +53,9 @@ namespace detail
 		typedef T type[4];
 	};
 
-#	define GLM_NOT_BUGGY_VC32BITS !(GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER & GLM_COMPILER_VC && GLM_COMPILER < GLM_COMPILER_VC2013)
+#	define GLM_NOT_BUGGY_VC32BITS !(GLM_MODEL == GLM_MODEL_32 && (GLM_COMPILER & GLM_COMPILER_VC) && GLM_COMPILER < GLM_COMPILER_VC2013)
 
-#	if GLM_ARCH & GLM_ARCH_SSE2 && GLM_NOT_BUGGY_VC32BITS
+#	if (GLM_ARCH & GLM_ARCH_SSE2) && GLM_NOT_BUGGY_VC32BITS
 		template <>
 		struct simd<float>
 		{
@@ -75,7 +75,7 @@ namespace detail
 		};
 #	endif
 
-#	if GLM_ARCH & GLM_ARCH_AVX && GLM_NOT_BUGGY_VC32BITS
+#	if (GLM_ARCH & GLM_ARCH_AVX) && GLM_NOT_BUGGY_VC32BITS
 		template <>
 		struct simd<double>
 		{
@@ -83,7 +83,7 @@ namespace detail
 		};
 #	endif
 
-#	if GLM_ARCH & GLM_ARCH_AVX2 && GLM_NOT_BUGGY_VC32BITS
+#	if (GLM_ARCH & GLM_ARCH_AVX2) && GLM_NOT_BUGGY_VC32BITS
 		template <>
 		struct simd<int64>
 		{
diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp
index 21076075..cc72ddaa 100644
--- a/test/core/core_type_vec4.cpp
+++ b/test/core/core_type_vec4.cpp
@@ -29,7 +29,6 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
-//#define GLM_FORCE_AVX2
 #if !(GLM_COMPILER & GLM_COMPILER_GCC)
 #	define GLM_META_PROG_HELPERS
 #endif