diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
index 6a99dd9ae..d054d2c11 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
@@ -270,7 +270,7 @@ public class Wandmaker extends NPC {
 				node.put( GIVEN, given );
 				
 				node.put( WAND1, wand1 );
-				node.put(WAND2, wand2);
+				node.put( WAND2, wand2 );
 
 				if (type == 2){
 					node.put( RITUALPOS, CeremonialCandle.ritualPos );
@@ -288,7 +288,7 @@ public class Wandmaker extends NPC {
 			if (!node.isNull() && (spawned = node.getBoolean( SPAWNED ))) {
 
 				//TODO remove when pre-0.3.2 saves are no longer supported
-				if (bundle.contains(TYPE)) {
+				if (node.contains(TYPE)) {
 					type = node.getInt(TYPE);
 				} else {
 					type = node.getBoolean("alternative")? 1 : 3;
@@ -300,7 +300,7 @@ public class Wandmaker extends NPC {
 				wand2 = (Wand)node.get( WAND2 );
 
 				if (type == 2){
-					CeremonialCandle.ritualPos = bundle.getInt( RITUALPOS );
+					CeremonialCandle.ritualPos = node.getInt( RITUALPOS );
 				}
 
 			} else {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RitualSitePainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RitualSitePainter.java
index 9b7edf927..fbda13131 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RitualSitePainter.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RitualSitePainter.java
@@ -47,6 +47,8 @@ public class RitualSitePainter extends Painter {
 
 		level.customTiles.add(vis);
 
+		fill(level, c.x-1, c.y-1, 3, 3, Terrain.EMPTY_DECO);
+
 		level.addItemToSpawn(new CeremonialCandle());
 		level.addItemToSpawn(new CeremonialCandle());
 		level.addItemToSpawn(new CeremonialCandle());