diff --git a/src/PocketMine/plugin/PluginBase.php b/src/PocketMine/plugin/PluginBase.php
index 7fd24e769..b41998466 100644
--- a/src/PocketMine/plugin/PluginBase.php
+++ b/src/PocketMine/plugin/PluginBase.php
@@ -30,17 +30,22 @@ use PocketMine\Utils\Config;
 
 abstract class PluginBase implements Plugin, CommandExecutor{
 
-	/**
-	 * @var PluginLoader
-	 */
+	/** @var PluginLoader */
 	private $loader;
 
 	/** @var \PocketMine\Server */
 	private $server;
+
+	/** @var bool */
 	private $isEnabled = false;
+
+	/** @var bool */
 	private $initialized = false;
+
 	/** @var PluginDescription */
 	private $description;
+
+	/** @var string */
 	private $dataFolder;
 	private $config;
 	/** @var string */
@@ -234,7 +239,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 	 * @return Server
 	 */
 	public final function getServer(){
-		return $this->dataFolder;
+		return $this->server;
 	}
 
 	/**
diff --git a/src/SPL/SplClassLoader.php b/src/SPL/SplClassLoader.php
index 3d6af9d72..f9c9333b5 100644
--- a/src/SPL/SplClassLoader.php
+++ b/src/SPL/SplClassLoader.php
@@ -43,24 +43,16 @@ require_once("SplAutoLoader.php");
  * @author Fabien Potencier <fabien.potencier@symfony-project.org>
  */
 class SplClassLoader implements SplAutoloader{
-	/**
-	 * @var string
-	 */
+	/** @var string */
 	private $fileExtension = '.php';
 
-	/**
-	 * @var boolean
-	 */
+	/** @var boolean */
 	private $includePathLookup = false;
 
-	/**
-	 * @var array
-	 */
+	/** @var array */
 	private $resources = array();
 
-	/**
-	 * @var integer
-	 */
+	/** @var integer */
 	private $mode = self::MODE_NORMAL;
 
 	/**
diff --git a/src/build/compile.sh b/src/build/compile.sh
index dfb446d44..7781effc8 100644
--- a/src/build/compile.sh
+++ b/src/build/compile.sh
@@ -228,7 +228,7 @@ elif [ "$COMPILE_TARGET" == "mac" ] || [ "$COMPILE_TARGET" == "mac32" ]; then
 elif [ "$COMPILE_TARGET" == "mac64" ]; then
 	[ -z "$march" ] && march=core2;
 	[ -z "$mtune" ] && mtune=generic;
-	CFLAGS="$CFLAGS -m64 -arch x86-64 -fomit-frame-pointer -mmacosx-version-min=10.5";
+	CFLAGS="$CFLAGS -m64 -arch x86_64 -fomit-frame-pointer -mmacosx-version-min=10.5";
 	LDFLAGS="$LDFLAGS -Wl,-rpath,@loader_path/../lib";
 	export DYLD_LIBRARY_PATH="@loader_path/../lib"
 	OPENSSL_TARGET="darwin64-x86_64-cc"
@@ -674,6 +674,7 @@ if [ "$(uname -s)" == "Darwin" ] && [ "$IS_CROSSCOMPILE" != "yes" ]; then
 	set +e
 	install_name_tool -delete_rpath "$DIR/bin/php5/lib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
 	install_name_tool -change "$DIR/bin/php5/lib/libz.1.dylib" "@loader_path/../lib/libz.1.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
+	install_name_tool -change "$DIR/bin/php5/lib/libcurl.4.dylib" "@loader_path/../lib/libcurl.4.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
 	install_name_tool -change "$DIR/bin/php5/lib/libyaml-0.2.dylib" "@loader_path/../lib/libyaml-0.2.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
 	install_name_tool -change "$DIR/bin/php5/lib/libreadline.$READLINE_VERSION.dylib" "@loader_path/../lib/libreadline.$READLINE_VERSION.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
 	install_name_tool -change "$DIR/bin/php5/lib/libhistory.$READLINE_VERSION.dylib" "@loader_path/../lib/libhistory.$READLINE_VERSION.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
@@ -682,7 +683,9 @@ if [ "$(uname -s)" == "Darwin" ] && [ "$IS_CROSSCOMPILE" != "yes" ]; then
 	install_name_tool -change "$DIR/bin/php5/lib/libncurses.6.0.dylib" "@loader_path/../lib/libncurses.6.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
 	install_name_tool -change "$DIR/bin/php5/lib/libpanel.6.0.dylib" "@loader_path/../lib/libpanel.6.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
 	install_name_tool -change "$DIR/bin/php5/lib/libssl.1.0.0.dylib" "@loader_path/../lib/libssl.1.0.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
+	install_name_tool -change "$DIR/bin/php5/lib/libssl.1.0.0.dylib" "@loader_path/../lib/libssl.1.0.0.dylib" "$DIR/bin/php5/lib/libcurl.4.dylib" >> "$DIR/install.log" 2>&1
 	install_name_tool -change "$DIR/bin/php5/lib/libcrypto.1.0.0.dylib" "@loader_path/../lib/libcrypto.1.0.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1
+	install_name_tool -change "$DIR/bin/php5/lib/libcrypto.1.0.0.dylib" "@loader_path/../lib/libcrypto.1.0.0.dylib" "$DIR/bin/php5/lib/libcurl.4.dylib" >> "$DIR/install.log" 2>&1
 	chmod 0777 "$DIR/bin/php5/lib/libssl.1.0.0.dylib" >> "$DIR/install.log" 2>&1
 	install_name_tool -change "$DIR/bin/php5/lib/libcrypto.1.0.0.dylib" "@loader_path/libcrypto.1.0.0.dylib" "$DIR/bin/php5/lib/libssl.1.0.0.dylib" >> "$DIR/install.log" 2>&1
 	chmod 0755 "$DIR/bin/php5/lib/libssl.1.0.0.dylib" >> "$DIR/install.log" 2>&1