diff --git a/assets/opencomputers/recipes/default.recipes b/assets/opencomputers/recipes/default.recipes
index 52c34e373..154e5afe2 100644
--- a/assets/opencomputers/recipes/default.recipes
+++ b/assets/opencomputers/recipes/default.recipes
@@ -67,13 +67,13 @@ wlanCard {
 }
 
 craftingUpgrade {
-  input: [[ingotIron, pistonBase, ingotIron]
+  input: [[ingotIron, craftingPiston, ingotIron]
           ["oc:circuitBasic", workbench, "oc:circuitBasic"]
           [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
 }
 generatorUpgrade {
   input: [[ingotIron, "", ingotIron]
-          ["oc:circuitBasic", pistonBase, "oc:circuitBasic"]
+          ["oc:circuitBasic", craftingPiston, "oc:circuitBasic"]
           ["oc:craftingCircuitBoardPrinted", ingotIron, "oc:craftingCircuitBoardPrinted"]]
 }
 navigationUpgrade {
@@ -83,12 +83,12 @@ navigationUpgrade {
 }
 signUpgrade {
   input: [[ingotIron, dyePowder, ingotIron]
-          ["oc:circuitAdvanced", stickWood, "oc:circuitAdvanced"]
+          ["oc:circuitBasic", stickWood, "oc:circuitBasic"]
           [ingotIron, pistonStickyBase, ingotIron]]
 }
 solarGeneratorUpgrade {
   input: [[glass, glass, glass]
-          ["oc:circuitAdvanced", "oc:craftingGenerator", "oc:circuitAdvanced"]]
+          ["oc:circuitElite", "oc:craftingGenerator", "oc:circuitElite"]]
 }
 
 nuggetIron {
diff --git a/assets/opencomputers/recipes/gregtech.recipes b/assets/opencomputers/recipes/gregtech.recipes
index be468025f..ba5826ef2 100644
--- a/assets/opencomputers/recipes/gregtech.recipes
+++ b/assets/opencomputers/recipes/gregtech.recipes
@@ -75,23 +75,22 @@ generatorUpgrade {
           ["oc:circuitAdvanced",craftingGenerator , "oc:circuitAdvanced"]
           [screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]]
 }
-#todo
-#navigationUpgrade {
-#  input: [[ingotGold, compass, ingotGold]
-#          ["oc:circuitElite", {item=map, subID=32767}, "oc:circuitElite"]
-#          [ingotGold, potion, ingotGold]]
-#}
-#todo
-#signUpgrade {
-#  input: [[ingotIron, dyePowder, ingotIron]
-#          ["oc:circuitAdvanced", stickWood, "oc:circuitAdvanced"]
-#          [ingotIron, pistonStickyBase, ingotIron]]
-#}
-#todo
-#solarGeneratorUpgrade {
-#  input: [[glass, glass, glass]
-#          ["oc:circuitAdvanced", "oc:craftingGenerator", "oc:circuitAdvanced"]]
-#}
+navigationUpgrade {
+  input: [[craftingRawMachineTier02, compass, screwStainlessSteel]
+          ["oc:circuitElite", {item=map, subID=any}, "oc:circuitElite"]
+          [screwStainlessSteel, potion, craftingToolScrewdriver]]
+}
+signUpgrade {
+  input: [[screwAluminium, dyePowder, screwAluminium]
+          ["oc:circuitBasic", stickWood, "oc:circuitBasic"]
+          [screwAluminium, craftingToolScrewdriver, screwAluminium]]
+}
+
+solarGeneratorUpgrade {
+  input: [[screwTitanium, "", screwTitanium]
+          ["oc:circuitElite", {item=tile.GT_Components,subID=7} , "oc:circuitElite"]
+          [screwTitanium, craftingToolScrewdriver, screwTitanium]]
+}
 
 
 cuttingWire {
diff --git a/li/cil/oc/Recipes.scala b/li/cil/oc/Recipes.scala
index 2275872f8..f076551a0 100644
--- a/li/cil/oc/Recipes.scala
+++ b/li/cil/oc/Recipes.scala
@@ -248,7 +248,7 @@ object Recipes {
           }
         }
       }
-    case other => throw new RecipeException("Invalid ingredient type (not a map or string): "+other)
+    case other => throw new RecipeException("Invalid ingredient type (not a map or string): " + other)
   }
 
   private def itemNameEquals(item: Item, name: String) =