diff --git a/plugins/basecommands/kick.sp b/plugins/basecommands/kick.sp
index ca1cd084..935100a2 100644
--- a/plugins/basecommands/kick.sp
+++ b/plugins/basecommands/kick.sp
@@ -141,7 +141,10 @@ public Action:Command_Kick(client, args)
 			{
 				kick_self = client;
 			}
-			PerformKick(client, target_list[i], Arguments[len]);
+			else
+			{
+				PerformKick(client, target_list[i], Arguments[len]);
+			}
 		}
 		
 		if (kick_self)
diff --git a/plugins/basecommands/map.sp b/plugins/basecommands/map.sp
index 79456582..45b00ad9 100644
--- a/plugins/basecommands/map.sp
+++ b/plugins/basecommands/map.sp
@@ -120,22 +120,28 @@ LoadMapList(Handle:menu)
 		return LoadMapFolder(menu);
 	}
 	
-	decl String:buffer[64], len;
+	decl String:buffer[256], len;
 	while (!IsEndOfFile(file) && ReadFileLine(file, buffer, sizeof(buffer)))
 	{
 		TrimString(buffer);
-
+		
 		if ((len = StrContains(buffer, ".bsp", false)) != -1)
 		{
 			buffer[len] = '\0';
 		}
 
-		if (buffer[0] == '\0' || !IsValidConVarChar(buffer[0]) || !IsMapValid(buffer))
+		if (buffer[0] == '\0' 
+			|| buffer[0] == ';'
+			|| buffer[0] == '/'
+			|| !IsValidConVarChar(buffer[0]))
 		{
 			continue;
 		}
-
-		AddMenuItem(menu, buffer, buffer);
+		
+		if (IsMapValid(buffer))
+		{
+			AddMenuItem(menu, buffer, buffer);
+		}
 	}
 
 	CloseHandle(file);