diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java
index eeee21bb2..9f301c4a9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java
@@ -136,9 +136,9 @@ public class SpellSprite extends Image {
 		}
 		
 		SpellSprite sprite = GameScene.spellSprite();
-		sprite.revive();
-		sprite.reset( index );
 		sprite.target = ch;
-		all.put( ch,  sprite );
+		sprite.reset( index );
+		sprite.revive();
+		all.put( ch, sprite );
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
index 28038af5e..94b1c8f1d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
@@ -578,6 +578,12 @@ public class PrisonBossLevel extends Level {
 		int tries = 0;
 		do {
 			tries++;
+
+			if (tries >= 100){
+				tries = 0;
+				fill -= 0.01f;
+			}
+
 			trapsPatch = Patch.generate(7, 7, fill, 0, false);
 
 			PathFinder.buildDistanceMap(tenguPos, BArray.not(trapsPatch, null));
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
index f280a1de7..81319746e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
@@ -115,8 +115,10 @@ public class Sungrass extends Plant {
 		}
 
 		public void boost( int amount ){
-			level += amount;
-			pos = target.pos;
+			if (target != null) {
+				level += amount;
+				pos = target.pos;
+			}
 		}
 		
 		@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
index 8a70876fe..e28f32f27 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
@@ -235,9 +235,11 @@ public class QuickSlotButton extends Button {
 
 			targeting = true;
 			CharSprite sprite = lastTarget.sprite;
-			
-			sprite.parent.addToFront( crossM );
-			crossM.point(sprite.center(crossM));
+
+			if (sprite.parent != null) {
+				sprite.parent.addToFront(crossM);
+				crossM.point(sprite.center(crossM));
+			}
 
 			crossB.point(slot.sprite.center(crossB));
 			crossB.visible = true;