diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
index c6fa5e7a..d452083a 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
@@ -234,7 +234,7 @@ void IUIScene_CreativeMenu::staticCtor()
 		ITEM_AUX(Tile::red_flower_Id, Rose::WHITE_TULIP)
 		ITEM_AUX(Tile::red_flower_Id, Rose::PINK_TULIP)
 		ITEM_AUX(Tile::red_flower_Id, Rose::OXEYE_DAISY)
-		ITEM(Tile::tallgrass2_Id)
+		ITEM(Tile::double_plant_Id)
 		ITEM_AUX(Tile::double_plant_Id, TallGrass2::LILAC)
 		ITEM_AUX(Tile::double_plant_Id, TallGrass2::TALL_GRASS)
 		ITEM_AUX(Tile::double_plant_Id, TallGrass2::LARGE_FERN)
diff --git a/Minecraft.Client/TileRenderer.cpp b/Minecraft.Client/TileRenderer.cpp
index 3a7bfb62..958c8bcd 100644
--- a/Minecraft.Client/TileRenderer.cpp
+++ b/Minecraft.Client/TileRenderer.cpp
@@ -4195,7 +4195,7 @@ bool TileRenderer::tesselateCrossInWorld( Tile* tt, int x, int y, int z )
 		zt += ((((seed >> 24) & 0xf) / 15.0f) - 0.5f) * 0.5f;
 	}
 
-	if (tt == Tile::tallgrass2)
+	if (tt == Tile::double_plant)
 	{
 		const int data = level->getData(x, y, z);
 		const bool isUpper = (data & TallGrass2::UPPER_BIT) != 0;
diff --git a/Minecraft.World/GrassTile.cpp b/Minecraft.World/GrassTile.cpp
index c42ea940..a758d4d8 100644
--- a/Minecraft.World/GrassTile.cpp
+++ b/Minecraft.World/GrassTile.cpp
@@ -121,8 +121,8 @@ void GrassTile::tick(Level *level, int x, int y, int z, Random *random)
 		}
 	}
 
-  Material* above = level->getMaterial(x, y + 1, z);
-	if (above->isSolid() || above->isLiquid()) level->setTileAndUpdate(x, y, z, Tile::dirt_Id);
+	Material* above = level->getMaterial(x, y + 1, z);
+	if (level->isSolidBlockingTile(x, y + 1, z) || above->isLiquid()) level->setTileAndUpdate(x, y, z, Tile::dirt_Id);
 }
 
 int GrassTile::getResource(int data, Random *random, int playerBonusLevel)
diff --git a/Minecraft.World/OreRecipies.cpp b/Minecraft.World/OreRecipies.cpp
index ed5a09b3..d408f3af 100644
--- a/Minecraft.World/OreRecipies.cpp
+++ b/Minecraft.World/OreRecipies.cpp
@@ -33,7 +33,7 @@ void OreRecipies::_init()
 	ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9));
 
 	ADD_OBJECT(map[8],Tile::slimeBlock);
-	ADD_OBJECT(map[8],new ItemInstance(Item::slimeBall, 9));
+	ADD_OBJECT(map[8],new ItemInstance(Item::slime_ball, 9));
 }
 void OreRecipies::addRecipes(Recipes *r) 
 {
diff --git a/Minecraft.World/PistonBaseTile.cpp b/Minecraft.World/PistonBaseTile.cpp
index 146ca166..1272582f 100644
--- a/Minecraft.World/PistonBaseTile.cpp
+++ b/Minecraft.World/PistonBaseTile.cpp
@@ -455,7 +455,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
 							int destZ = adjZ - Facing::STEP_Z[facing];
 
 							stopSharingIfServer(level, destX, destY, destZ);
-							level->setTileAndData(destX, destY, destZ, Tile::pistonMovingPiece_Id, adjData, Tile::UPDATE_NONE);
+							level->setTileAndData(destX, destY, destZ, Tile::piston_extension_Id, adjData, Tile::UPDATE_NONE);
 							level->setTileEntity(destX, destY, destZ, PistonMovingPiece::newMovingPieceEntity(adjBlock, adjData, facing, false, false));
 
 							ignoreUpdate(false);
@@ -852,7 +852,7 @@ bool PistonBaseTile::createPush(Level *level, int sx, int sy, int sz, int facing
 			int dz = nz + Facing::STEP_Z[facing];
 
 			stopSharingIfServer(level, dx, dy, dz);
-			level->setTileAndData(dx, dy, dz, Tile::pistonMovingPiece_Id, data, Tile::UPDATE_NONE);
+			level->setTileAndData(dx, dy, dz, Tile::piston_extension_Id, data, Tile::UPDATE_NONE);
 			level->setTileEntity(dx, dy, dz, PistonMovingPiece::newMovingPieceEntity(block, data, facing, true, false));
 			level->removeTile(nx, ny, nz);
 			level->updateNeighborsAt(nx, ny, nz, block);
diff --git a/Minecraft.World/Tile.cpp b/Minecraft.World/Tile.cpp
index 328421da..8c388e03 100644
--- a/Minecraft.World/Tile.cpp
+++ b/Minecraft.World/Tile.cpp
@@ -1790,7 +1790,6 @@ const int Tile::web_Id;
 const int Tile::tallgrass_Id;
 const int Tile::deadbush_Id;
 const int Tile::piston_Id;
-const int Tile::pistonMovingPiece_Id;
 const int Tile::wool_Id;
 const int Tile::piston_extension_Id;
 const int Tile::yellow_flower_Id;