diff --git a/core/Maps/MapList.php b/core/Maps/MapList.php
index 38ed30fa..cd2f0ec7 100644
--- a/core/Maps/MapList.php
+++ b/core/Maps/MapList.php
@@ -239,7 +239,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 		$labelLine->setY(-7);
 		$labelLine->render();
 
-		$searchFrame = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultMapSearch(self::ACTION_SEARCH_MAP_NAME,self::ACTION_SEARCH_AUTHOR);
+		$searchFrame = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultMapSearch(self::ACTION_SEARCH_MAP_NAME, self::ACTION_SEARCH_AUTHOR);
 		$headFrame->addChild($searchFrame);
 
 		// Predefine description Label
@@ -739,7 +739,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 	 * @internal
 	 */
 	public function searchByMapName(array $callback) {
-		$login = $callback[1][1];
+		$login  = $callback[1][1];
 		$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
 
 		$searchString = $callback[1][3][0]['Value'];
@@ -755,7 +755,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 	 * @internal
 	 */
 	public function searchByAuthor(array $callback) {
-		$login = $callback[1][1];
+		$login  = $callback[1][1];
 		$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
 
 		$searchString = $callback[1][3][0]['Value'];
diff --git a/core/Script/ScriptManager.php b/core/Script/ScriptManager.php
index 892fac23..46f3f8de 100644
--- a/core/Script/ScriptManager.php
+++ b/core/Script/ScriptManager.php
@@ -43,8 +43,6 @@ class ScriptManager implements UsageInformationAble {
 
 	/**
 	 * Enable script callbacks
-	 *
-	 * @param bool $enable
 	 * @return bool
 	 */
 	public function enableScriptCallbacks() {
diff --git a/core/Server/Commands.php b/core/Server/Commands.php
index 32ab827e..66789c1f 100644
--- a/core/Server/Commands.php
+++ b/core/Server/Commands.php
@@ -116,7 +116,7 @@ class Commands implements CallbackListener, CommandListener, ManialinkPageAnswer
 			$itemQuad = new Quad_Icons128x32_1();
 			$itemQuad->setSubStyle($itemQuad::SUBSTYLE_ManiaLinkSwitch);
 			$itemQuad->setAction(self::ACTION_SET_PAUSE);
-			$this->maniaControl->getActionsMenu()->addAdminMenuItem($itemQuad, 13, 'Pause the current game');
+			$this->maniaControl->getActionsMenu()->addAdminMenuItem($itemQuad, 32, 'Pause the current game');
 		}
 
 	}
@@ -132,13 +132,13 @@ class Commands implements CallbackListener, CommandListener, ManialinkPageAnswer
 			$itemQuad = new Quad_BgRaceScore2();
 			$itemQuad->setSubStyle($itemQuad::SUBSTYLE_SendScore);
 			$itemQuad->setAction(self::ACTION_EXTEND_WARMUP);
-			$this->maniaControl->getActionsMenu()->addMenuItem($itemQuad, false, 14, 'Extend Warmup');
+			$this->maniaControl->getActionsMenu()->addMenuItem($itemQuad, false, 22, 'Extend Warmup');
 
 			// Stop WarmUp menu item
 			$itemQuad = new Quad_Icons64x64_1();
 			$itemQuad->setSubStyle($itemQuad::SUBSTYLE_ArrowGreen);
 			$itemQuad->setAction(self::ACTION_END_WARMUP);
-			$this->maniaControl->getActionsMenu()->addMenuItem($itemQuad, false, 15, 'End Warmup');
+			$this->maniaControl->getActionsMenu()->addMenuItem($itemQuad, false, 24, 'End Warmup');
 		} else {
 			$this->maniaControl->getActionsMenu()->removeMenuItem(14, false);
 			$this->maniaControl->getActionsMenu()->removeMenuItem(15, false);