diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm
index 8858b5b12b7f..bf3d7a09da2c 100644
--- a/code/modules/projectiles/guns/smgs.dm
+++ b/code/modules/projectiles/guns/smgs.dm
@@ -224,7 +224,15 @@
 		/obj/item/attachable/attached_gun/grenade/m203,
 		/obj/item/attachable/stock/smg/collapsible/mp5a5,
 		)
-	starting_attachment_types = list(/obj/item/attachable/stock/smg/collapsible/mp5a5)
+
+/obj/item/weapon/gun/smg/mp5/mp5a5/handle_starting_attachment()
+	..()
+	var/obj/item/attachable/stock/smg/collapsible/mp5a5/S = new(src)
+	S.hidden = FALSE
+	S.flags_attach_features &= ~ATTACH_REMOVABLE
+	S.Attach(src)
+	S.apply_on_weapon(src)
+	update_attachable(S.slot)
 
 /obj/item/weapon/gun/smg/mp5/mp5a5/set_gun_attachment_offsets()
 	attachable_offset = list("muzzle_x" = 26, "muzzle_y" = 17,"rail_x" = 8, "rail_y" = 19, "under_x" = 19, "under_y" = 13, "stock_x" = 39, "stock_y" = 11)
diff --git a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
index 12ef475fcf5d..d8db268e9ef6 100644
--- a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
@@ -328,6 +328,7 @@
 		/obj/item/explosive/grenade/flashbang,
 	)
 	preload = /obj/item/explosive/grenade/slug/baton
+	disallowed_grenade_types = list(/obj/item/explosive/grenade/spawnergrenade, /obj/item/explosive/grenade/alien, /obj/item/explosive/grenade/incendiary/molotov)
 
 //-------------------------------------------------------
 //M79 Grenade Launcher subtype of the M81