diff --git a/application/core/Configurators/ScriptSettings.php b/application/core/Configurators/ScriptSettings.php
index ddd4e7dc..91c3634c 100644
--- a/application/core/Configurators/ScriptSettings.php
+++ b/application/core/Configurators/ScriptSettings.php
@@ -129,7 +129,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 			$loadedSettings[$row->settingName] = $row->settingValue;
 			settype($loadedSettings[$row->settingName], gettype($scriptSettings[$row->settingName]));
 		}
-		$result->close();
+		$result->free();
 		if (!$loadedSettings) {
 			return true;
 		}
diff --git a/application/core/Configurators/ServerSettings.php b/application/core/Configurators/ServerSettings.php
index ea317202..2a31c6ac 100644
--- a/application/core/Configurators/ServerSettings.php
+++ b/application/core/Configurators/ServerSettings.php
@@ -118,7 +118,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 			settype($serverSettings[$row->settingName], $oldType);
 			$applySettings = true;
 		}
-		$result->close();
+		$result->free();
 		if (!$applySettings) {
 			return true;
 		}
@@ -203,8 +203,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 			if (is_bool($value)) {
 				// Boolean checkbox
 				$quad = new Quad();
-				$quad->setX($width / 2 * 0.46);
-				$quad->setZ(-0.01);
+				$quad->setPosition($width * 0.23, 0, -0.01);
 				$quad->setSize(4, 4);
 
 				$checkBox = new CheckBox(self::ACTION_PREFIX_SETTING . $name, $value, $quad);
@@ -214,7 +213,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 				$entry = new Entry();
 				$settingFrame->add($entry);
 				$entry->setStyle(Label_Text::STYLE_TextValueSmall);
-				$entry->setX($width / 2 * 0.46);
+				$entry->setX($width * 0.23);
 				$entry->setTextSize(1);
 				$entry->setSize($width * 0.48, $settingHeight * 0.9);
 				$entry->setName(self::ACTION_PREFIX_SETTING . $name);
diff --git a/application/core/Database/Database.php b/application/core/Database/Database.php
index 9fe30e8d..63b68cd6 100644
--- a/application/core/Database/Database.php
+++ b/application/core/Database/Database.php
@@ -140,7 +140,7 @@ class Database implements TimerListener {
 		}
 		$count = $result->num_rows;
 		if ($count <= 0) {
-			$result->close();
+			$result->free();
 			return true;
 		}
 		$optimizeQuery = "OPTIMIZE TABLE ";
@@ -153,7 +153,7 @@ class Database implements TimerListener {
 			}
 			$index++;
 		}
-		$result->close();
+		$result->free();
 		$optimizeQuery .= ";";
 		$this->mysqli->query($optimizeQuery);
 		if ($this->mysqli->error) {
diff --git a/application/core/Players/PlayerDataManager.php b/application/core/Players/PlayerDataManager.php
index 6b385ecc..6b724b70 100644
--- a/application/core/Players/PlayerDataManager.php
+++ b/application/core/Players/PlayerDataManager.php
@@ -114,7 +114,7 @@ class PlayerDataManager {
 		while ($row = $result->fetch_object()) {
 			$this->metaData[$row->class . $row->dataName] = $row;
 		}
-		$result->close();
+		$result->free();
 	}
 
 	/**
diff --git a/application/core/Players/PlayerManager.php b/application/core/Players/PlayerManager.php
index cf71ec6c..533b71fa 100644
--- a/application/core/Players/PlayerManager.php
+++ b/application/core/Players/PlayerManager.php
@@ -391,7 +391,7 @@ class PlayerManager implements CallbackListener, TimerListener {
 		}
 
 		$row = $result->fetch_object();
-		$result->close();
+		$result->free();
 
 		if (!isset($row)) {
 			return null;
@@ -476,7 +476,7 @@ class PlayerManager implements CallbackListener, TimerListener {
 		}
 
 		$row = $result->fetch_object();
-		$result->close();
+		$result->free();
 
 		if (!isset($row)) {
 			return null;
diff --git a/application/core/Server/Server.php b/application/core/Server/Server.php
index 5500b230..489f3a4e 100644
--- a/application/core/Server/Server.php
+++ b/application/core/Server/Server.php
@@ -176,7 +176,7 @@ class Server implements CallbackListener {
 		while ($row = $result->fetch_object()) {
 			array_push($servers, $row);
 		}
-		$result->close();
+		$result->free();
 
 		return $servers;
 	}
diff --git a/application/core/Statistics/StatisticManager.php b/application/core/Statistics/StatisticManager.php
index ed5fc458..54cbced3 100644
--- a/application/core/Statistics/StatisticManager.php
+++ b/application/core/Statistics/StatisticManager.php
@@ -124,7 +124,7 @@ class StatisticManager {
 		while ($row = $result->fetch_object()) {
 			$this->stats[$row->name] = $row;
 		}
-		$result->close();
+		$result->free();
 
 		// TODO: own model class
 
@@ -208,7 +208,7 @@ class StatisticManager {
 		}
 
 		arsort($stats);
-		$result->close();
+		$result->free();
 		return $stats;
 	}
 
@@ -488,7 +488,7 @@ class StatisticManager {
 
 		$row = $result->fetch_object();
 
-		$result->close();
+		$result->free();
 		return $row->value;
 	}