diff --git a/src/PocketMine/Server.php b/src/PocketMine/Server.php
index 3e60d6099..21ef69cce 100644
--- a/src/PocketMine/Server.php
+++ b/src/PocketMine/Server.php
@@ -46,7 +46,7 @@ class Server{
 
 	private function load(){
 		$this->version = new VersionString();
-		if(defined("PocketMine\\DEBUG") and \PocketMine\DEBUG >= 0){
+		if(defined("PocketMine\\DEBUG") and \PocketMine\DEBUG >= 0 and function_exists("cli_set_process_title")){
 			@cli_set_process_title("PocketMine-MP " . \PocketMine\VERSION);
 		}
 		console("[INFO] Starting Minecraft PE server on " . ($this->serverip === "0.0.0.0" ? "*" : $this->serverip) . ":" . $this->port);
diff --git a/src/PocketMine/ServerAPI.php b/src/PocketMine/ServerAPI.php
index 6e601355c..639227e98 100644
--- a/src/PocketMine/ServerAPI.php
+++ b/src/PocketMine/ServerAPI.php
@@ -76,11 +76,6 @@ class ServerAPI{
 	 */
 	public $ban;
 
-	/**
-	 * @var EntityAPI
-	 */
-	public $entity;
-
 	/**
 	 * @var TimeAPI
 	 */
@@ -160,7 +155,6 @@ class ServerAPI{
 			console("[INFO] [UPnP] Trying to port forward...");
 			PortForward($this->getProperty("server-port"));
 		}
-
 		$this->server = new Server($this->getProperty("server-name"), $this->getProperty("gamemode"), ($seed = $this->getProperty("level-seed")) != "" ? (int) $seed : false, $this->getProperty("server-port"), ($ip = $this->getProperty("server-ip")) != "" ? $ip : "0.0.0.0");
 		$this->server->api = $this;
 		self::$serverRequest = $this->server;