diff --git a/mods/ts/audio/music.yaml b/mods/ts/audio/music.yaml
index 248342f338..b40169be56 100644
--- a/mods/ts/audio/music.yaml
+++ b/mods/ts/audio/music.yaml
@@ -1,6 +1,5 @@
 #Tiberian Sun
 intro: Intro
-maps: Map Selection
 approach: Approach
 defense: The Defense
 duskhour: Dusk Hour
@@ -20,6 +19,7 @@ storm: Storm
 timebomb: Timebomb
 valves1b: Valves
 whatlurk: What Lurks
+maps: Map Selection
 #Firestorm
 dmachine: Deploy Machines
 elusive: Elusive
diff --git a/mods/ts/maps/blank-shellmap/shellmap.lua b/mods/ts/maps/blank-shellmap/shellmap.lua
index d502ef195c..916c3ddf81 100644
--- a/mods/ts/maps/blank-shellmap/shellmap.lua
+++ b/mods/ts/maps/blank-shellmap/shellmap.lua
@@ -1,5 +1,5 @@
 PlayMusic = function()
-	Media.PlayMusic("maps", PlayMusic)
+	Media.PlayMusic("intro", PlayMusic)
 end
 
 WorldLoaded = function()
diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml
index 0622304871..9bc81162f2 100644
--- a/mods/ts/rules/vehicles.yaml
+++ b/mods/ts/rules/vehicles.yaml
@@ -533,6 +533,8 @@ MMCH:
 	WithVoxelBarrel:
 		LocalOffset: -128, 85, 256
 	AutoTarget:
+	Selectable:
+		Bounds: 30, 42, 0, -8
 
 HMEC:
 	Inherits: ^Tank
@@ -595,7 +597,7 @@ SMECH:
 	WithInfantryBody:
 	Selectable:
 		Voices: Mech
-		Bounds: 16, 32
+		Bounds: 20, 32, 0, -8
 
 BIKE:
 	Inherits: ^Vehicle