diff --git a/application/core/Maps/Map.php b/application/core/Maps/Map.php
index dc8003f5..f50d37a2 100644
--- a/application/core/Maps/Map.php
+++ b/application/core/Maps/Map.php
@@ -18,25 +18,25 @@ class Map {
 	 */
 	public $index = -1;
 	public $name = 'undefined';
-	public $rawName = '';
-	public $uid = '';
-	public $fileName = '';
-	public $environment = '';
+	public $rawName = null;
+	public $uid = null;
+	public $fileName = null;
+	public $environment = null;
 	public $authorTime = -1;
 	public $goldTime = -1;
 	public $copperPrice = -1;
-	public $mapType = '';
-	public $mapStyle = '';
+	public $mapType = null;
+	public $mapStyle = null;
 	public $nbCheckpoints = -1;
 	public $nbLaps = -1;
 	/** @var MXMapInfo $mx */
 	public $mx = null;
-	public $authorLogin = '';
-	public $authorNick = '';
-	public $authorZone = '';
-	public $authorEInfo = '';
-	public $comment = '';
-	public $titleUid = '';
+	public $authorLogin = null;
+	public $authorNick = null;
+	public $authorZone = null;
+	public $authorEInfo = null;
+	public $comment = null;
+	public $titleUid = null;
 	public $startTime = -1;
 	public $lastUpdate = 0;
 	public $karma = null;
diff --git a/application/core/Players/Player.php b/application/core/Players/Player.php
index 9cd2398f..3ace38f2 100644
--- a/application/core/Players/Player.php
+++ b/application/core/Players/Player.php
@@ -19,24 +19,24 @@ class Player {
 	 */
 	public $index = -1;
 	public $pid = -1;
-	public $login = '';
-	public $nickname = '';
-	public $rawNickname = '';
-	public $path = '';
+	public $login = null;
+	public $nickname = null;
+	public $rawNickname = null;
+	public $path = null;
 	public $authLevel = 0;
-	public $language = '';
-	public $avatar = '';
+	public $language = null;
+	public $avatar = null;
 	public $allies = array();
-	public $clubLink = '';
+	public $clubLink = null;
 	public $teamId = -1;
-	public $isOfficial = false;
+	public $isOfficial = null;
 	public $ladderScore = -1.;
 	public $ladderRank = -1;
 	public $ladderStats = null;
 	public $joinTime = -1;
-	public $ipAddress = '';
+	public $ipAddress = null;
 	public $isConnected = true;
-	public $clientVersion = '';
+	public $clientVersion = null;
 	public $downloadRate = -1;
 	public $uploadRate = -1;
 	public $skins = null;