diff --git a/jsettlers.common/src/main/resources/jsettlers/common/buildings/baker.xml b/jsettlers.common/src/main/resources/jsettlers/common/buildings/baker.xml
index 44d2105325..3648a6d2f0 100644
--- a/jsettlers.common/src/main/resources/jsettlers/common/buildings/baker.xml
+++ b/jsettlers.common/src/main/resources/jsettlers/common/buildings/baker.xml
@@ -56,6 +56,10 @@
 	<blocked dx="2" dy="5" block="false" />
 	<blocked dx="3" dy="5" block="false" />
 	<blocked dx="4" dy="5" block="false" />
+	<blocked dx="-2" dy="2" block="false" />
+	<blocked dx="-1" dy="3" block="false" />
+	<blocked dx="0" dy="4" block="false" />
+	<blocked dx="1" dy="5" block="false" />
 
 	<door dx="3" dy="2" />
 	
@@ -63,7 +67,7 @@
 	<constructionStack dx="4" dy="4" material="STONE" buildrequired="5" />
 	<requestStack dx="3" dy="4" material="FLOUR" />
 	<requestStack dx="4" dy="2" material="WATER" />
-	<offerStack dx="-2" dy="1" material="BREAD" />
+	<offerStack dx="-2" dy="2" material="BREAD" />
 
 	<bricklayer dx="-1" dy="2" direction="NORTH_EAST" />
 	<bricklayer dx="1" dy="4" direction="NORTH_EAST" />
@@ -87,10 +91,10 @@
 	<job name="gohome" type="GO_TO" successjob="hide" failjob="hide" dx="3" dy="2"/>
 	<job name="hide" type="HIDE" successjob="reset1" failjob="reset1"/>
 	<job name="reset1" type="SET_MATERIAL" successjob="wait" failjob="wait" material="NO_MATERIAL"/>
-	<job name="wait" type="WAIT" successjob="check1" failjob="A_wait" time="1"/>
-	<job name="check1" type="AVAILABLE" successjob="check2" failjob="A_wait" dx="3" dy="4" material="FLOUR"/>
-	<job name="check2" type="AVAILABLE" successjob="check3" failjob="A_wait" dx="4" dy="2" material="WATER"/>
-	<job name="check3" type="NOT_FULL" successjob="A_show" failjob="A_wait" dx="-2" dy="1"/>
+	<job name="wait" type="WAIT" successjob="check1" failjob="check1" time="1"/>
+	<job name="check1" type="AVAILABLE" successjob="check2" failjob="wait" dx="3" dy="4" material="FLOUR"/>
+	<job name="check2" type="AVAILABLE" successjob="check3" failjob="wait" dx="4" dy="2" material="WATER"/>
+	<job name="check3" type="NOT_FULL" successjob="A_show" failjob="wait" dx="-2" dy="2"/>
 
 	<!-- go take flour -->
 	<job name="A_show"   type="SHOW"         successjob="A_walkA1" failjob="gohome" dx="3" dy="2" />
diff --git a/jsettlers.common/src/main/resources/jsettlers/common/buildings/winegrower.xml b/jsettlers.common/src/main/resources/jsettlers/common/buildings/winegrower.xml
index 870049c83d..a6bf59a7ae 100644
--- a/jsettlers.common/src/main/resources/jsettlers/common/buildings/winegrower.xml
+++ b/jsettlers.common/src/main/resources/jsettlers/common/buildings/winegrower.xml
@@ -63,6 +63,7 @@
     <!-- materials checked with original -->
 	<constructionStack dx="0" dy="4" material="PLANK" buildrequired="4" />
 	<constructionStack dx="2" dy="4" material="STONE" buildrequired="4" />
+	<offerStack dx="3" dy="4" material="WINE" />
 	
 	<bricklayer dx="2" dy="3" direction="NORTH_WEST" />
 	<bricklayer dx="3" dy="2" direction="NORTH_WEST" />
diff --git a/jsettlers.logic/src/test/java/jsettlers/integration/ai/AiDifficultiesIT.java b/jsettlers.logic/src/test/java/jsettlers/integration/ai/AiDifficultiesIT.java
index 8b657dc797..06c510e674 100644
--- a/jsettlers.logic/src/test/java/jsettlers/integration/ai/AiDifficultiesIT.java
+++ b/jsettlers.logic/src/test/java/jsettlers/integration/ai/AiDifficultiesIT.java
@@ -54,7 +54,7 @@ public class AiDifficultiesIT {
 
 	@Test
 	public void easyShouldConquerVeryEasy() throws MapLoadException {
-		holdBattleBetween(EPlayerType.AI_EASY, EPlayerType.AI_VERY_EASY, 75 * MINUTES);
+		holdBattleBetween(EPlayerType.AI_EASY, EPlayerType.AI_VERY_EASY, 80 * MINUTES);
 	}
 
 	@Test
@@ -78,7 +78,7 @@ public void veryHardShouldProduceCertainAmountOfSoldiersWithin90Minutes() throws
 
 		MatchConstants.clock().fastForwardTo(90 * MINUTES);
 
-		short expectedMinimalProducedSoldiers = 920;
+		short expectedMinimalProducedSoldiers = 850;
 		short producedSoldiers = startingGame.getMainGrid().getPartitionsGrid().getPlayer(0).getEndgameStatistic().getAmountOfProducedSoldiers();
 		if (producedSoldiers < expectedMinimalProducedSoldiers) {
 			stopAndFail("AI_VERY_HARD was not able to produce " + expectedMinimalProducedSoldiers + " soldiers within 90 minutes.\nOnly " + producedSoldiers
diff --git a/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-40m.zmap b/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-40m.zmap
index 06d0a35dc0..9b2f12b279 100644
Binary files a/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-40m.zmap and b/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-40m.zmap differ
diff --git a/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-65m.zmap b/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-65m.zmap
index e9a4f29419..1cd8959994 100644
Binary files a/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-65m.zmap and b/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-65m.zmap differ
diff --git a/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-90m.zmap b/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-90m.zmap
index 1a2b98f2cc..8a49824f39 100644
Binary files a/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-90m.zmap and b/jsettlers.testutils/src/main/resources/jsettlers/integration/replay/fullproduction/savegame-90m.zmap differ