diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java
index ed07224b..8629e38a 100644
--- a/src/main/java/appeng/block/AEBaseBlock.java
+++ b/src/main/java/appeng/block/AEBaseBlock.java
@@ -446,7 +446,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 	@Override
 	public boolean hasComparatorInputOverride()
 	{
-		return this.isInventory;
+		return this.isInventory();
 	}
 
 	@Override
@@ -711,4 +711,19 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 		return featureSubName;
 	}
 
+	public boolean isInventory()
+	{
+		return isInventory;
+	}
+
+	public void setInventory( boolean isInventory )
+	{
+		this.isInventory = isInventory;
+	}
+
+	public void setHasSubtypes( boolean hasSubtypes )
+	{
+		this.hasSubtypes = hasSubtypes;
+	}
+
 }
diff --git a/src/main/java/appeng/block/AEBaseItemBlock.java b/src/main/java/appeng/block/AEBaseItemBlock.java
index aef30287..f38aceee 100644
--- a/src/main/java/appeng/block/AEBaseItemBlock.java
+++ b/src/main/java/appeng/block/AEBaseItemBlock.java
@@ -50,7 +50,7 @@ public class AEBaseItemBlock extends ItemBlock
 	{
 		super( id );
 		this.blockType = (AEBaseBlock) id;
-		this.hasSubtypes = this.blockType.hasSubtypes;
+		this.hasSubtypes = this.blockType.hasSubtypes();
 	}
 
 	@Override
diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java
index 58efaa94..5ba9c72c 100644
--- a/src/main/java/appeng/block/AEBaseTileBlock.java
+++ b/src/main/java/appeng/block/AEBaseTileBlock.java
@@ -91,7 +91,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
 	protected void setTileEntity( final Class<? extends TileEntity> c )
 	{
 		this.tileEntityType = c;
-		this.isInventory = IInventory.class.isAssignableFrom( c );
+		this.setInventory( IInventory.class.isAssignableFrom( c ) );
 		this.setTileProvider( this.hasBlockTileEntity() );
 	}
 
diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java
index 5030f744..78ae0bdc 100644
--- a/src/main/java/appeng/block/storage/BlockSkyChest.java
+++ b/src/main/java/appeng/block/storage/BlockSkyChest.java
@@ -60,7 +60,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
 		this.setTileEntity( TileSkyChest.class );
 		this.setOpaque( this.setFullSize( false ) );
 		this.lightOpacity = 0;
-		this.hasSubtypes = true;
+		this.setHasSubtypes( true );
 		this.setHardness( 50 );
 		this.blockResistance = 150.0f;
 		this.type = type;
diff --git a/src/main/java/appeng/client/render/ModelGenerator.java b/src/main/java/appeng/client/render/ModelGenerator.java
index ea8658a0..9a6a89ba 100644
--- a/src/main/java/appeng/client/render/ModelGenerator.java
+++ b/src/main/java/appeng/client/render/ModelGenerator.java
@@ -613,7 +613,7 @@ public class ModelGenerator
 			BakedQuad bf = this.faceBakery.makeBakedQuad( face.getTo(), face.getFrom(), bpf, face.getSpite(), myFace, mr, null, true, true );
 			bf = new IColoredBakedQuad.ColoredBakedQuad( bf.getVertexData(), face.getColor(), bf.getFace() );
 
-			if( face.isEdge )
+			if( face.isEdge() )
 				this.generatedModel.getFaceQuads( myFace ).add( bf );
 			else
 				this.generatedModel.getGeneralQuads().add( bf );
diff --git a/src/main/java/appeng/client/render/SMFace.java b/src/main/java/appeng/client/render/SMFace.java
index 21cd1c47..050dc9df 100644
--- a/src/main/java/appeng/client/render/SMFace.java
+++ b/src/main/java/appeng/client/render/SMFace.java
@@ -65,4 +65,9 @@ public class SMFace
 		return spite;
 	}
 
+	public boolean isEdge()
+	{
+		return isEdge;
+	}
+
 }
diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java
index 878d3851..ae67a9c7 100644
--- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java
+++ b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java
@@ -49,7 +49,7 @@ public class SkyStoneBlock extends AEBaseBlock
 	{
 		super( Material.rock, Optional.of( type.name() ) );
 		this.setHardness( 50 );
-		this.hasSubtypes = true;
+		this.setHasSubtypes( true );
 		this.blockResistance = BLOCK_RESISTANCE;
 		if( type == SkystoneType.STONE )
 		{