diff --git a/code/game/say.dm b/code/game/say.dm
index b275d8b69c..85ae9f0681 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
 /atom/movable/proc/attach_spans(input, list/spans)
 	var/customsayverb = findtext(input, "*")
 	if(customsayverb)
-		input = capitalize(copytext(input, length(input[customsayverb]) + 1))
+		input = capitalize(copytext(input, customsayverb + length(input[customsayverb])))
 	if(input)
 		return "[message_spans_start(spans)][input]</span>"
 	else
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index bd0b85a498..d26a6efb02 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -171,7 +171,8 @@
 	var/turf/T = user.loc	//get user's location for delay checks
 
 	//the istype cascade has been spread among various procs for easy overriding
-	if(try_clean(W, user, T) || try_wallmount(W, user, T) || try_decon(W, user, T) || (iswall(src) && try_destroy(W, user, T)))
+	var/srctype = type
+	if(try_clean(W, user, T) || try_wallmount(W, user, T) || try_decon(W, user, T) || (type == srctype && try_destroy(W, user, T)))
 		return
 
 	return ..()