diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java b/SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java
index e969b64ae..e086f18db 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java
@@ -78,6 +78,7 @@ public class Tilemap extends Visual {
 		bufferPositions = new short[size];
 		for (int i = 0; i < bufferPositions.length; i++)
 			bufferPositions[i] = -1;
+		bufferLength = 0;
 
 		width = cellW * mapWidth;
 		height = cellH * mapHeight;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
index ac1e37678..921c4ea6b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
@@ -259,7 +259,7 @@ public class Wandmaker extends NPC {
 				if (setRoom( rooms )){
 					Wandmaker npc = new Wandmaker();
 					do {
-						npc.pos = Dungeon.level.pointToCell(room.random());
+						npc.pos = level.pointToCell(room.random());
 					} while (level.map[npc.pos] == Terrain.ENTRANCE || level.map[npc.pos] == Terrain.SIGN);
 					level.mobs.add( npc );