diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b64ae7072..348a4be52 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -126,25 +126,27 @@ set(SERVER_SRC
   bind_ship.c
   bind_storage.c
   bind_unit.c
-  ${ERESSEA_SRC})
+)
 
 if (SQLITE3_FOUND)
-set (SERVER_SRC
+set (SERVER_SRC ${SERVER_SRC}
   sqlite.c
   bind_sqlite.c
-  ${SERVER_SRC})
+)
 endif (SQLITE3_FOUND)
 
 if (CURSES_FOUND)
-set (SERVER_SRC
+set (SERVER_SRC ${SERVER_SRC}
   gmtool.c
   listbox.c
   bind_gmtool.c
-  ${SERVER_SRC})
+)
 endif(CURSES_FOUND)
 
+add_library(game ${ERESSEA_SRC})
 add_executable(eressea ${SERVER_SRC})
 target_link_libraries(eressea
+  game
   ${TOLUA_LIBRARIES}
   ${LUA_LIBRARIES}
   ${QUICKLIST_LIBRARIES}
@@ -178,12 +180,12 @@ set(TESTS_SRC
   ${ATTRIBUTES_TESTS}
   ${UTIL_TESTS}
   ${KERNEL_TESTS}
-  ${ERESSEA_SRC}
 )
 
 add_executable(test_eressea ${TESTS_SRC})
-target_link_libraries(test_eressea ${CUTEST_LIBRARIES})
 target_link_libraries(test_eressea
+  game
+  ${CUTEST_LIBRARIES}
   ${LUA_LIBRARIES}
   ${QUICKLIST_LIBRARIES}
   ${STORAGE_LIBRARIES}
diff --git a/src/names.c b/src/names.c
index 8f4ed75ce..650717792 100644
--- a/src/names.c
+++ b/src/names.c
@@ -275,7 +275,7 @@ static const char *dragon_name(const unit * u)
     if (anzahl > 1) {
         const char *no_article = strchr((const char *)str, ' ');
         assert(no_article);
-        /* TODO: GERMAN */
+        // TODO: localization
         sprintf(name, "Die %sn von %s", no_article + 1, rname(u->region,
             default_locale));
     }
diff --git a/src/report.c b/src/report.c
index 94f384803..efdb80268 100644
--- a/src/report.c
+++ b/src/report.c
@@ -1100,6 +1100,7 @@ static void describe(FILE * F, const seen_region * sr, faction * f)
     if (rule_region_owners()) {
         const faction *owner = region_get_owner(r);
         if (owner != NULL) {
+            // TODO: localization
             bytes = _snprintf(bufp, size, " Die Region ist im Besitz von %s.",
                 factionname(owner));
             if (wrptr(&bufp, &size, bytes) != 0)