diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index a24fdee0c..5553fa9b3 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -79,15 +79,15 @@ HayBale                 = Wheat, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 SnowBlock               = SnowBall,  1:1, 1:2, 2:1, 2:2
 ClayBlock               = Clay,      1:1, 1:2, 2:1, 2:2
 BrickBlock              = Brick,     1:1, 1:2, 2:1, 2:2
+PolishedGranite, 4      = Granite, 1:1, 1:2, 2:1, 2:2
+PolishedDiorite, 4      = Diorite, 1:1, 1:2, 2:1, 2:2
+PolishedAndesite, 4     = Andesite, 1:1, 1:2, 2:1, 2:2
 StoneBrick, 4           = Stone,     1:1, 1:2, 2:1, 2:2
 BookShelf               = Planks,    1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
 Sandstone, 4            = Sand,      1:1, 1:2, 2:1, 2:2
 SmoothSandstone, 4      = Sandstone, 1:1, 1:2, 2:1, 2:2
 OrnamentSandstone       = SandstoneSlab, 1:1, 1:2
 JackOLantern            = Pumpkin, 1:1 | Torch, 1:2
-PolishedGranite, 4      = Granite, 1:1, 1:2, 2:1, 2:2
-PolishedDiorite, 4      = Diorite, 1:1, 1:2, 2:1, 2:2
-PolishedAndesite, 4     = Andesite, 1:1, 1:2, 2:1, 2:2
 CoarsedDirt, 4          = Dirt, 1:1, 2:2 | Gravel, 1:2, 2:1
 CoarsedDirt, 4          = Gravel, 1:1, 2:2 | Dirt, 1:2, 2:1
 SlimeBlock              = Slimeball, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 2de4a3e4c..6fff4c18f 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -353,7 +353,7 @@ bool cBlockHandler::GetPlacementBlockTypeMeta(
 {
 	// By default, all blocks can be placed and the meta is copied over from the item's damage value:
 	a_BlockType = m_BlockType;
-	a_BlockMeta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage & 0x0f);
+	a_BlockMeta = static_cast<NIBBLETYPE>(a_Player->GetEquippedItem().m_ItemDamage & 0x0f);
 	return true;
 }
 
diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index 202fb900e..cf8982afb 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -366,6 +366,7 @@ void cCraftingRecipes::ClearRecipes(void)
 
 void cCraftingRecipes::AddRecipeLine(int a_LineNum, const AString & a_RecipeLine)
 {
+	// Remove any spaces within the line:
 	AString RecipeLine(a_RecipeLine);
 	RecipeLine.erase(std::remove_if(RecipeLine.begin(), RecipeLine.end(), isspace), RecipeLine.end());
 
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index b3f24f9ee..f38e2a3e3 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -336,7 +336,7 @@ bool cItemHandler::OnPlayerPlace(
 	if (
 		BlockHandler(ClickedBlock)->DoesIgnoreBuildCollision() ||
 		BlockHandler(ClickedBlock)->DoesIgnoreBuildCollision(&a_Player, ClickedBlockMeta)
-		)
+	)
 	{
 		cChunkInterface ChunkInterface(a_World.GetChunkMap());
 		BlockHandler(ClickedBlock)->OnDestroyedByPlayer(ChunkInterface, a_World, &a_Player, a_BlockX, a_BlockY, a_BlockZ);
@@ -757,7 +757,7 @@ bool cItemHandler::GetPlacementBlockTypeMeta(
 		return false;
 	}
 	
-	cBlockHandler * BlockH = BlockHandler((BLOCKTYPE)m_ItemType);
+	cBlockHandler * BlockH = BlockHandler(static_cast<BLOCKTYPE>(m_ItemType));
 	cChunkInterface ChunkInterface(a_World->GetChunkMap());
 	return BlockH->GetPlacementBlockTypeMeta(
 		ChunkInterface, a_Player,