diff --git a/src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala b/src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
index 76ffe5a39..3647ca5ff 100644
--- a/src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
+++ b/src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
@@ -30,7 +30,7 @@ object CallbackDocHandler {
 
   private val VexPattern = """(?s)^function(\(.*?\).*?); (.*)$""".r
 
-  def getRecipes(registry: IModRegistry): util.List[_] = registry.getIngredientRegistry.getIngredients(classOf[ItemStack]).collect {
+  def getRecipes(registry: IModRegistry): util.List[CallbackDocRecipe] = registry.getIngredientRegistry.getIngredients(classOf[ItemStack]).collect {
     case stack: ItemStack =>
       val callbacks = api.Driver.environmentsFor(stack).flatMap(getCallbacks).toBuffer
 
@@ -52,9 +52,7 @@ object CallbackDocHandler {
         Option(pages.map(page => new CallbackDocRecipe(stack, page)))
       }
       else None
-  }.collect {
-    case Some(handler) => handler
-  }.flatten.toList
+  }.flatten.flatten.toList
 
   private def getCallbacks(env: Class[_]) = if (env != null) {
 
diff --git a/src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala b/src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala
index 041665299..11a329921 100644
--- a/src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala
+++ b/src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala
@@ -24,12 +24,12 @@ import scala.collection.convert.WrapAsScala._
 
 object ManualUsageHandler {
 
-  def getRecipes(registry: IModRegistry): util.List[_] = registry.getIngredientRegistry.getIngredients(classOf[ItemStack]).collect {
+  def getRecipes(registry: IModRegistry): util.List[ManualUsageRecipe] = registry.getIngredientRegistry.getIngredients(classOf[ItemStack]).collect {
     case stack: ItemStack => api.Manual.pathFor(stack) match {
-      case s: String => new ManualUsageRecipe(stack, s)
-      case _ =>
+      case s: String => Option(new ManualUsageRecipe(stack, s))
+      case _ => None
     }
-  }
+  }.flatten.toList
 
   object ManualUsageRecipeHandler extends IRecipeHandler[ManualUsageRecipe] {
     override def getRecipeWrapper(recipe: ManualUsageRecipe) = recipe
diff --git a/src/main/scala/li/cil/oc/server/agent/Inventory.scala b/src/main/scala/li/cil/oc/server/agent/Inventory.scala
index bbb41ad04..1954556b7 100644
--- a/src/main/scala/li/cil/oc/server/agent/Inventory.scala
+++ b/src/main/scala/li/cil/oc/server/agent/Inventory.scala
@@ -15,7 +15,7 @@ import net.minecraft.block.state.IBlockState
 
 import scala.collection.immutable
 
-class Inventory(val agent: internal.Agent) extends InventoryPlayer(null) {
+class Inventory(playerEntity: EntityPlayer, val agent: internal.Agent) extends InventoryPlayer(playerEntity) {
 
   def selectedItemStack: ItemStack = agent.mainInventory.getStackInSlot(agent.selectedSlot)
 
diff --git a/src/main/scala/li/cil/oc/server/agent/Player.scala b/src/main/scala/li/cil/oc/server/agent/Player.scala
index a7f2b7239..7194f0671 100644
--- a/src/main/scala/li/cil/oc/server/agent/Player.scala
+++ b/src/main/scala/li/cil/oc/server/agent/Player.scala
@@ -103,7 +103,7 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc
 
   setSize(1, 1)
 
-  this.inventory = new Inventory(agent)
+  this.inventory = new Inventory(this, agent)
 
   var facing, side = EnumFacing.SOUTH