diff --git a/source/Chunk.cpp b/source/Chunk.cpp
index 01a6640e2..149adaa62 100644
--- a/source/Chunk.cpp
+++ b/source/Chunk.cpp
@@ -479,14 +479,14 @@ void cChunk::TickBlocks(MTRand & a_TickRandom)
 		}
 
 		unsigned int Index = MakeIndexNoCheck( m_BlockTickX, m_BlockTickY, m_BlockTickZ );
-		BLOCKTYPE ID = m_BlockTypes[Index];
-		switch( ID )
+		BLOCKTYPE BlockType = m_BlockTypes[Index];
+		switch (BlockType)
 		{
 			case E_BLOCK_FARMLAND: TickFarmland (m_BlockTickX, m_BlockTickY, m_BlockTickZ); break;
 			
 			default:
 			{
-				cBlockHandler * Handler = BlockHandler(ID);
+				cBlockHandler * Handler = BlockHandler(BlockType);
 				ASSERT(Handler != NULL);  // Happenned on server restart, FS #243
 				Handler->OnUpdate(m_World, m_BlockTickX + m_PosX * Width, m_BlockTickY, m_BlockTickZ + m_PosZ * Width);
 				break;
diff --git a/source/World.cpp b/source/World.cpp
index 3a4cf789e..7acbf8a39 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -795,7 +795,7 @@ void cWorld::GrowTreeFromSapling(int a_X, int a_Y, int a_Z, char a_SaplingMeta)
 	}
 	Other.insert(Other.begin(), Logs.begin(), Logs.end());
 	Logs.clear();
-	GrowTreeImage(Logs);
+	GrowTreeImage(Other);
 }