diff --git a/common/biomesoplenty/configuration/BOPEntities.java b/common/biomesoplenty/configuration/BOPEntities.java
index a003c234b..03ecc353c 100644
--- a/common/biomesoplenty/configuration/BOPEntities.java
+++ b/common/biomesoplenty/configuration/BOPEntities.java
@@ -88,7 +88,7 @@ public class BOPEntities {
 			
 			if (Biomes.netherBone.isPresent() && Biomes.netherDesert.isPresent())
 			{
-				EntityRegistry.addSpawn(EntityPhantom.class, 65, 1, 1, EnumCreatureType.monster, Biomes.netherBone.get(), Biomes.netherDesert.get());
+				EntityRegistry.addSpawn(EntityPhantom.class, 8, 1, 1, EnumCreatureType.monster, Biomes.netherBone.get(), Biomes.netherDesert.get());
 			}
 		}
 	}
diff --git a/common/biomesoplenty/potions/PotionEventHandler.java b/common/biomesoplenty/potions/PotionEventHandler.java
index 6a695be4e..592b48695 100644
--- a/common/biomesoplenty/potions/PotionEventHandler.java
+++ b/common/biomesoplenty/potions/PotionEventHandler.java
@@ -40,9 +40,9 @@ public class PotionEventHandler
 			double posY = event.entityLiving.posY;
 			double posZ = event.entityLiving.posZ;
 
-			double randX = (double)rand.nextInt(2);
-			double randY = (double)rand.nextInt(3);
-			double randZ = (double)rand.nextInt(2);
+			double randX = 1.0 - (rand.nextDouble() * 2.0);
+			double randY = (double) rand.nextInt(3);
+			double randZ = 1.0 - (rand.nextDouble() * 2.0);
 			
 			event.entityLiving.motionX = 0.0;	
 			event.entityLiving.motionY = 0.0;
@@ -50,7 +50,8 @@ public class PotionEventHandler
 
 			if (rand.nextInt(5) == 0)
 			{
-				event.entityLiving.setPosition(posX + randX, posY + randY, posZ + randZ);
+				if (!event.entityLiving.worldObj.checkBlockCollision(event.entityLiving.boundingBox.offset(randX, randY, randZ)))
+					event.entityLiving.setPosition(posX + randX, posY + randY, posZ + randZ);
 			}
 
 			if (event.entityLiving.getActivePotionEffect(Potions.possession.get()).getDuration() == 0)