diff --git a/system/compat/classes.php b/system/compat/classes.php
index 051fbdf2..2009140b 100644
--- a/system/compat/classes.php
+++ b/system/compat/classes.php
@@ -9,7 +9,30 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-class Player extends OTS_Player {}
-class Guild extends OTS_Guild {}
+class Account extends OTS_Account {
+	public function loadById($id) {
+		$this->load($id);
+	}
+	public function loadByName($name) {
+		$this->find($name);
+	}
+}
+
+class Player extends OTS_Player {
+	public function loadById($id) {
+		$this->load($id);
+	}
+	public function loadByName($name) {
+		$this->find($name);
+	}
+}
+class Guild extends OTS_Guild {
+	public function loadById($id) {
+		$this->load($id);
+	}
+	public function loadByName($name) {
+		$this->find($name);
+	}
+}
 class GuildRank extends OTS_GuildRank {}
 class House extends OTS_House {}
diff --git a/system/libs/pot/OTS_ServerInfo.php b/system/libs/pot/OTS_ServerInfo.php
index fd06749e..30a81f7b 100644
--- a/system/libs/pot/OTS_ServerInfo.php
+++ b/system/libs/pot/OTS_ServerInfo.php
@@ -123,7 +123,7 @@ class OTS_ServerInfo
         {
             // loads respond XML
             $info = new OTS_InfoRespond();
-            if(!$info->loadXML( utf8_encode($status->getBuffer())))
+            if(!$info->loadXML( $status->getBuffer()))
 				return false;
 
             return $info;
diff --git a/templates/tibiacom/headline.php b/templates/tibiacom/headline.php
index dbef28a1..85dae0f2 100644
--- a/templates/tibiacom/headline.php
+++ b/templates/tibiacom/headline.php
@@ -14,7 +14,7 @@ imagecolortransparent($image, imagecolorallocate($image, 0, 0, 0));
 
 // set text
 $font = getenv('GDFONTPATH') . DIRECTORY_SEPARATOR . 'martel.ttf';
-imagettftext($image, 18, 0, 4, 20, imagecolorallocate($image, 240, 209, 164), $font, utf8_decode($text));
+imagettftext($image, 18, 0, 4, 20, imagecolorallocate($image, 240, 209, 164), $font, $text);
 
 // header mime type
 header('Content-type: image/gif');