diff --git a/src/main/java/cr0s/warpdrive/api/FunctionGet.java b/src/main/java/cr0s/warpdrive/api/FunctionGet.java
index 9d073f40..3f86d14c 100644
--- a/src/main/java/cr0s/warpdrive/api/FunctionGet.java
+++ b/src/main/java/cr0s/warpdrive/api/FunctionGet.java
@@ -1,6 +1,6 @@
 package cr0s.warpdrive.api;
 
-public interface FunctionGet<Return> {
+public interface FunctionGet<R> {
 	
-	Return apply();
+	R apply();
 }
diff --git a/src/main/java/cr0s/warpdrive/api/FunctionSetVector.java b/src/main/java/cr0s/warpdrive/api/FunctionSetVector.java
index 26abb45e..1554c83f 100644
--- a/src/main/java/cr0s/warpdrive/api/FunctionSetVector.java
+++ b/src/main/java/cr0s/warpdrive/api/FunctionSetVector.java
@@ -1,6 +1,6 @@
 package cr0s.warpdrive.api;
 
-public interface FunctionSetVector<Component> {
+public interface FunctionSetVector<V> {
 	
-	void apply(Component x, Component y, Component z);
+	void apply(V x, V y, V z);
 }
diff --git a/src/main/java/cr0s/warpdrive/data/AirSpreader.java b/src/main/java/cr0s/warpdrive/data/AirSpreader.java
index 72a5e04c..e5b5f530 100644
--- a/src/main/java/cr0s/warpdrive/data/AirSpreader.java
+++ b/src/main/java/cr0s/warpdrive/data/AirSpreader.java
@@ -247,7 +247,7 @@ public class AirSpreader {
 							z - facingSource.getZOffset()));
 					if (blockStateGenerator.getBlock() instanceof BlockAirGeneratorTiered) {
 						final EnumFacing facingGenerator = blockStateGenerator.getValue(BlockProperties.FACING);
-						if (facingGenerator == facingSource) {
+						if (facingGenerator.equals(facingSource)) {
 							// all good
 							hasGenerator = true;
 						}