diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Game.java b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
index 99b46b2c9..358de099d 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Game.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
@@ -114,7 +114,10 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
 		BitmapCache.context = TextureCache.context = instance = this;
 		
 		DisplayMetrics m = new DisplayMetrics();
-		getWindowManager().getDefaultDisplay().getMetrics( m );
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+			getWindowManager().getDefaultDisplay().getRealMetrics( m );
+		else
+			getWindowManager().getDefaultDisplay().getMetrics( m );
 		density = m.density;
 		dispHeight = m.heightPixels;
 		dispWidth = m.widthPixels;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
index c8700fbb5..8910975cc 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
@@ -151,7 +151,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
 	public Image getIcon() {
 		Image icon;
 		if (((Hero)target).belongings.weapon != null){
-			icon = new ItemSprite(Dungeon.hero.belongings.weapon.image, null);
+			icon = new ItemSprite(((Hero)target).belongings.weapon.image, null);
 		} else {
 			icon = new ItemSprite(new Item(){ {image = ItemSpriteSheet.WEAPON_HOLDER; }});
 		}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index a9c530fd5..e2404b019 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -1496,6 +1496,8 @@ public class Hero extends Char {
 	
 	public boolean search( boolean intentional ) {
 		
+		if (!isAlive()) return false;
+		
 		boolean smthFound = false;
 
 		int distance = heroClass == HeroClass.ROGUE ? 2 : 1;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BlobEmitter.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BlobEmitter.java
index c636e6c0d..e3dd6dce5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BlobEmitter.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BlobEmitter.java
@@ -56,9 +56,9 @@ public class BlobEmitter extends Emitter {
 		for (int i = blob.area.left; i < blob.area.right; i++) {
 			for (int j = blob.area.top; j < blob.area.bottom; j++) {
 				cell = i + j*Dungeon.level.width();
-				if (map[cell] > 0
-						&& cell < Dungeon.level.heroFOV.length
-						&& Dungeon.level.heroFOV[cell]) {
+				if (cell < Dungeon.level.heroFOV.length
+						&& Dungeon.level.heroFOV[cell]
+						&& map[cell] > 0) {
 					float x = (i + Random.Float()) * size;
 					float y = (j + Random.Float()) * size;
 					factory.emit(this, index, x, y);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/VaultRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/VaultRoom.java
index d2892f106..1f320385f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/VaultRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/VaultRoom.java
@@ -51,10 +51,8 @@ public class VaultRoom extends SpecialRoom {
 		Random.shuffle(prizeClasses);
 		
 		Item i1, i2;
-		do {
-			i1 = prize( level );
-			i2 = prize( level );
-		} while (i1.getClass() == i2.getClass());
+		i1 = prize( level );
+		i2 = prize( level );
 		level.drop( i1, c ).type = Heap.Type.CRYSTAL_CHEST;
 		level.drop( i2, c + PathFinder.NEIGHBOURS8[Random.Int( 8 )]).type = Heap.Type.CRYSTAL_CHEST;
 		level.addItemToSpawn( new CrystalKey( Dungeon.depth ) );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java
index 3c718466b..33c36274f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java
@@ -221,9 +221,7 @@ public class BuffIndicator extends Component {
 	
 	public static void refreshHero() {
 		if (heroInstance != null) {
-			synchronized (heroInstance) {
-				heroInstance.needsRefresh = true;
-			}
+			heroInstance.needsRefresh = true;
 		}
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Compass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Compass.java
index a71c2f9d7..bb0183393 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Compass.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Compass.java
@@ -52,6 +52,11 @@ public class Compass extends Image {
 	public void update() {
 		super.update();
 		
+		if (cell < 0 || cell >= Dungeon.level.length()){
+			visible = false;
+			return;
+		}
+		
 		if (!visible) {
 			visible = Dungeon.level.visited[cell] || Dungeon.level.mapped[cell];
 		}