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 6b87ade1b..63fd26e9c 100644
--- a/src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
+++ b/src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
@@ -33,7 +33,7 @@ object CallbackDocHandler {
 
   private val VexPattern = """(?s)^function(\(.*?\).*?); (.*)$""".r
 
-  def getRecipes(registry: IModRegistry): util.List[_] = registry.getItemRegistry.getItemList.collect {
+  def getRecipes(registry: IModRegistry): util.List[CallbackDocRecipe] = registry.getItemRegistry.getItemList.collect {
     case stack: ItemStack =>
       val callbacks = api.Driver.environmentsFor(stack).flatMap(getCallbacks).toBuffer
 
@@ -70,9 +70,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 f74c0d02f..41e516217 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.getItemRegistry.getItemList.collect {
+  def getRecipes(registry: IModRegistry): util.List[ManualUsageRecipe] = registry.getItemRegistry.getItemList.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