diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6282fc0..b56ab3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,8 @@ include(CheckCXXSourceCompiles)
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Werror -Wall -Wextra -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=sign-compare -std=c++11")
 	set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-	set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
-	set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "-g -Os -DNDEBUG")
+	set(CMAKE_CXX_FLAGS_RELEASE "-g -O2 -DNDEBUG")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 	# /Zi - Produces a program database (PDB) that contains type information and symbolic debugging information for use with the debugger.
diff --git a/entityx/tags/TagsComponent_test.cc b/entityx/tags/TagsComponent_test.cc
index 036ad16..71a66ed 100644
--- a/entityx/tags/TagsComponent_test.cc
+++ b/entityx/tags/TagsComponent_test.cc
@@ -27,7 +27,7 @@ int size(const T &t) {
   int n = 0;
   for (auto i : t) {
     ++n;
-    (void)i; // Unused on purpose, suppress warning
+    (void)i;  // Unused on purpose, suppress warning
   }
   return n;
 }