diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
index 71fd3a0ee..54e64a7a3 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
@@ -35,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourg
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfWealth;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
+import com.shatteredpixel.shatteredpixeldungeon.levels.Level.Feeling;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 import com.watabou.utils.Bundle;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
index e7f41c941..367c6c050 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
@@ -58,7 +58,7 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
 	public void destroy() {
 		super.destroy();
 		
-		instance = null;
+		instance = new QuickSlotButton[4];
 		
 		lastItem = null;
 		lastTarget = null;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
index ba3fc6a72..35e8919c9 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
@@ -173,7 +173,7 @@ public class WndSettings extends Window {
 				}
 			};
 			btnQuickSlot.setRect( 0, btnBrightness.bottom() + GAP, WIDTH, BTN_HEIGHT );
-			btnQuickSlot.checked( ShatteredPixelDungeon.quickSlots() == 1 );
+			btnQuickSlot.checked( ShatteredPixelDungeon.quickSlots() == 2 );
 			add( btnQuickSlot );
 			
 			resize( WIDTH, (int)btnQuickSlot.bottom() );