diff --git a/MVES/Classes/MV_MapList.uc b/MVES/Classes/MV_MapList.uc
index f7b5dfc..44ed65b 100644
--- a/MVES/Classes/MV_MapList.uc
+++ b/MVES/Classes/MV_MapList.uc
@@ -35,15 +35,11 @@ function Configure()
 //Else add to list and find rules that use it
 function GlobalLoad(bool bFullscan)
 {
-	local string CurMap, ClearMap, NewMaps;
-	local int i, j, k;
+	local string CurMap;
+	local int i;
 	local MV_MapFilter MapFilter;
 	local MV_Sort sorter;
 
-	Mutator.CleanRules();
-	Mutator.CountFilters();
-	if ( Mutator.ServerCodeName == '' )
-		Mutator.SetPropertyText("ServerCodeName",string(rand(MaxInt))$string(rand(MaxInt))  );
 	
 	MapFilter = new class'MV_MapFilter';
 	MapFilter.bEnableMapTags = Mutator.bEnableMapTags;
diff --git a/MVES/Classes/MapVote.uc b/MVES/Classes/MapVote.uc
index 7a10963..4f0eb2c 100644
--- a/MVES/Classes/MapVote.uc
+++ b/MVES/Classes/MapVote.uc
@@ -787,7 +787,7 @@ function GenerateMapList(bool bFullscan)
 
 	if ( bReloadConfigDuringReload )
 	{
-		Log("[MVE] Reload config result: "@ConsoleCommand("RELOADCFG "$Self));
+		Log("[MVE] Reload config result: "@ConsoleCommand("RELOADCFG"));
 	}
 
 	if ( MapList == None )
@@ -797,6 +797,11 @@ function GenerateMapList(bool bFullscan)
 		MapList.Configure();
 	}
 
+	CleanRules();
+	CountFilters();
+	if ( ServerCodeName == '' )
+		SetPropertyText("ServerCodeName", string(rand(MaxInt))$string(rand(MaxInt)));
+
 	MapList.GlobalLoad(bFullscan);
 }