diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8547c160..7f12a0f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,6 +105,7 @@ elseif (UNIX)
     elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
         # O3 and Ofast include one or more flags that cause java to crash when using gcc6
         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-signed-zeros -freciprocal-math -fno-unroll-loops -fno-tree-loop-optimize -fno-plt")
+        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -Og")
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og")
     elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp b/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp
index 9b998274..be21726f 100755
--- a/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp
+++ b/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp
@@ -116,13 +116,11 @@ SpaceSquad::~SpaceSquad()
 	}
 
 	// Tell all the squads guarding me that I am not longer guardable
-
-	SpaceSquadList::iterator iterGuardedByList = m_guardedByList->begin();
-
-	for (; iterGuardedByList != m_guardedByList->end(); ++iterGuardedByList)
-	{
-		(*iterGuardedByList)->removeGuardTarget();
-	}
+    for (SpaceSquadList::iterator it = m_guardedByList->begin(), next_it = it; it != m_guardedByList->end(); it = next_it)
+    {
+        ++next_it;
+        (*it)->removeGuardTarget();
+    }
 
 	delete m_guardedByList;