diff --git a/src/world/generator/object/tree/TreeObject.php b/src/world/generator/object/tree/TreeObject.php
index 86677c8c7..109702334 100644
--- a/src/world/generator/object/tree/TreeObject.php
+++ b/src/world/generator/object/tree/TreeObject.php
@@ -23,6 +23,8 @@
 class TreeObject{
 	public $overridable = array(
 		0 => true,
+		2 => true,
+		3 => true,
 		6 => true,
 		17 => true,
 		18 => true,
diff --git a/src/world/generator/populator/TreePopulator.php b/src/world/generator/populator/TreePopulator.php
index 635b813eb..7b6a2be31 100644
--- a/src/world/generator/populator/TreePopulator.php
+++ b/src/world/generator/populator/TreePopulator.php
@@ -43,9 +43,9 @@ class TreePopulator extends Populator{
 				continue;
 			}			
 			if($random->nextFloat() > 0.75){
-				$meta = 1;
+				$meta = SaplingBlock::BIRCH;
 			}else{
-				$meta = 0;
+				$meta = SaplingBlock::OAK;
 			}
 			TreeObject::growTree($this->level, new Vector3($x, $y, $z), $random, $meta);
 		}
@@ -57,7 +57,7 @@ class TreePopulator extends Populator{
 			if($b->getID() !== DIRT and $b->getID() !== GRASS){
 				if(--$y <= 0){
 					return -1;
-				}				
+				}	
 			}else{
 				break;
 			}