diff --git a/application/plugins/Chatlog.php b/application/plugins/Chatlog.php
index 6a3c7a33..2d628386 100644
--- a/application/plugins/Chatlog.php
+++ b/application/plugins/Chatlog.php
@@ -1,7 +1,7 @@
 <?php
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
-use ManiaControl\FileUtil;
+use ManiaControl\Files\FileUtil;
 use ManiaControl\ManiaControl;
 use ManiaControl\Plugins\Plugin;
 
diff --git a/application/plugins/CustomVotes.php b/application/plugins/CustomVotes.php
index 2b3003fa..cf32e724 100644
--- a/application/plugins/CustomVotes.php
+++ b/application/plugins/CustomVotes.php
@@ -522,7 +522,7 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
 		// Background Quad
 		$backgroundQuad = new Quad();
 		$frame->add($backgroundQuad);
-		$backgroundQuad->setSize($width, $height);
+		$backgroundQuad->setSize($width, $height);	
 		$backgroundQuad->setStyles($quadStyle, $quadSubstyle);
 
 		//Vote for label
diff --git a/application/plugins/Endurance.php b/application/plugins/Endurance.php
index f4f63ac8..a2da4958 100644
--- a/application/plugins/Endurance.php
+++ b/application/plugins/Endurance.php
@@ -2,6 +2,7 @@
 use ManiaControl\ManiaControl;
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
+use ManiaControl\Maps\Map;
 use ManiaControl\Plugins\Plugin;
 
 /**
@@ -22,6 +23,7 @@ class EndurancePlugin implements CallbackListener, Plugin {
 	 */
 	/** @var maniaControl $maniaControl  */
 	private $maniaControl = null;
+	/** @var Map $currentMap */
 	private $currentMap = null;
 	private $playerLapTimes = array();
 
diff --git a/application/plugins/LocalRecords.php b/application/plugins/LocalRecords.php
index 5fbf6a9a..210c874c 100644
--- a/application/plugins/LocalRecords.php
+++ b/application/plugins/LocalRecords.php
@@ -174,7 +174,7 @@ class LocalRecordsPlugin implements CallbackListener, TimerListener, Plugin {
 		if (!$this->updateManialink) return;
 		$this->updateManialink = false;
 		$manialink = $this->buildManialink();
-		$this->sendManialink($manialink);
+		$this->maniaControl->manialinkManager->sendManialink($manialink);
 	}
 
 	/**
@@ -270,24 +270,6 @@ class LocalRecordsPlugin implements CallbackListener, TimerListener, Plugin {
 		}
 	}
 
-	/**
-	 * Send manialink to clients
-	 *
-	 * @param string $manialink
-	 * @param string $login
-	 */
-	private function sendManialink($manialink, $login = null) {
-		if ($login) {
-			if (!$this->maniaControl->client->query('SendDisplayManialinkPageToLogin', $login, $manialink, 0, false)) {
-				trigger_error("Couldn't send manialink to player '{$login}'. " . $this->maniaControl->getClientErrorText());
-			}
-			return;
-		}
-		if (!$this->maniaControl->client->query('SendDisplayManialinkPage', $manialink, 0, false)) {
-			trigger_error("Couldn't send manialink to players. " . $this->maniaControl->getClientErrorText());
-		}
-	}
-
 	/**
 	 * Handle ClientUpdated callback
 	 *
diff --git a/application/plugins/Obstacle.php b/application/plugins/Obstacle.php
index 1409b9d6..3e94ba82 100644
--- a/application/plugins/Obstacle.php
+++ b/application/plugins/Obstacle.php
@@ -126,8 +126,10 @@ class ObstaclePlugin implements CallbackListener, CommandListener, Plugin {
 		// Send jump callback
 		$params = explode(' ', $chatCallback[1][2], 2);
 		$param = $player->login . ";" . $params[1] . ";";
-		if (!$this->maniaControl->client->query('TriggerModeScriptEvent', self::CB_JUMPTO, $param)) {
-			trigger_error("Couldn't send jump callback for '{$player->login}'. " . $this->maniaControl->getClientErrorText());
+		try{
+			$this->maniaControl->client->triggerModeScriptEvent(self::CB_JUMPTO, $param);
+		} catch(\Exception $e){
+			trigger_error("Couldn't send jump callback for '{$player->login}'. " . $e->getMessage());
 		}
 	}