diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index 80eafea05..c54f86398 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -892,7 +892,7 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
 	}
 
 	/* if ((u->race->ec_flags & NOGIVE) || fval(u,FL_LOCKED)) {*/
-	if (u->race->ec_flags & NOGIVE) {
+	if (u->race->ec_flags & NOGIVE && u2!=NULL) {
 		add_message(&u->faction->msgs,
 				msg_error(u, S->s, "race_nogive", "race", u->race));
 		return;
@@ -1056,16 +1056,18 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
 		return;
 	}
 
-	if (!(u->race->ec_flags & GIVEITEM)) {
-		add_message(&u->faction->msgs,
-				msg_error(u, S->s, "race_nogive", "race", u->race));
-		return;
-	}
-	if (u2 && !(u2->race->ec_flags & GETITEM)) {
-		ADDMSG(&u->faction->msgs,
-				msg_error(u, S->s, "race_notake", "race", u2->race));
-		return;
-	}
+  if (u2!=NULL) {
+    if (!(u->race->ec_flags & GIVEITEM)) {
+      add_message(&u->faction->msgs,
+        msg_error(u, S->s, "race_nogive", "race", u->race));
+      return;
+    }
+    if (!(u2->race->ec_flags & GETITEM)) {
+      ADDMSG(&u->faction->msgs,
+        msg_error(u, S->s, "race_notake", "race", u2->race));
+      return;
+    }
+  }
 
 	itype = finditemtype(s, u->faction->locale);
 	if (itype!=NULL) {
diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c
index 8253e815d..357926c13 100644
--- a/src/common/gamecode/randenc.c
+++ b/src/common/gamecode/randenc.c
@@ -1135,7 +1135,7 @@ randomevents(void)
 	}
 #endif
 
-	/* Talente von Dämonen verschieben sich */
+	/* Talentverschiebung: Talente von Dämonen verschieben sich */
 
 	for (r = regions; r; r = r->next) {
 		for (u = r->units; u; u = u->next) {
diff --git a/src/common/items/items.dsp b/src/common/items/items.dsp
index cf98009c9..1a85b43f5 100644
--- a/src/common/items/items.dsp
+++ b/src/common/items/items.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE RSC /l 0x407
 # ADD RSC /l 0x407
 BSC32=bscmake.exe
diff --git a/src/common/modules/modules.dsp b/src/common/modules/modules.dsp
index 6c6e88bbb..3fc062de1 100644
--- a/src/common/modules/modules.dsp
+++ b/src/common/modules/modules.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE RSC /l 0x407
 # ADD RSC /l 0x407
 BSC32=bscmake.exe
diff --git a/src/common/races/races.dsp b/src/common/races/races.dsp
index 4de7eb006..177547128 100644
--- a/src/common/races/races.dsp
+++ b/src/common/races/races.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE RSC /l 0x407
 # ADD RSC /l 0x407
 BSC32=bscmake.exe
diff --git a/src/common/spells/spells.dsp b/src/common/spells/spells.dsp
index ff2f3ed14..f63c087dd 100644
--- a/src/common/spells/spells.dsp
+++ b/src/common/spells/spells.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE RSC /l 0x407
 # ADD RSC /l 0x407
 BSC32=bscmake.exe
diff --git a/src/common/triggers/triggers.dsp b/src/common/triggers/triggers.dsp
index 092d3e647..b02842679 100644
--- a/src/common/triggers/triggers.dsp
+++ b/src/common/triggers/triggers.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE RSC /l 0x407
 # ADD RSC /l 0x407
 BSC32=bscmake.exe
diff --git a/src/eressea.dsw b/src/eressea.dsw
index ff1181225..aa19d853a 100644
--- a/src/eressea.dsw
+++ b/src/eressea.dsw
@@ -150,18 +150,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "skilltest"=.\skilltest\skilltest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "spells"=.\common\spells\spells.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/src/eressea/eressea.dsp b/src/eressea/eressea.dsp
index c7d37f906..79439483f 100644
--- a/src/eressea/eressea.dsp
+++ b/src/eressea/eressea.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /Za /W4 /GX /Zi /O2 /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
 # ADD RSC /l 0x407 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -136,6 +136,17 @@ SOURCE=.\korrektur.h
 # Begin Source File
 
 SOURCE=.\main.c
+
+!IF  "$(CFG)" == "eressea - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "eressea - Win32 Debug"
+
+# ADD CPP /D MALLOCDBG=3
+
+!ELSEIF  "$(CFG)" == "eressea - Win32 Profile"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
diff --git a/src/eressea/main.c b/src/eressea/main.c
index f1e716040..37589fe6e 100644
--- a/src/eressea/main.c
+++ b/src/eressea/main.c
@@ -381,7 +381,7 @@ game_done(void)
 
 #include "magic.h"
 
-#if MALLOCDBG
+#ifdef MALLOCDBG
 void
 init_malloc_debug(void)
 {
@@ -638,7 +638,7 @@ main(int argc, char *argv[])
 		return -1;
 	}
 #endif
-#if 0
+#ifdef MALLOCDBG
 	init_malloc_debug();
 #endif