diff --git a/conf/lang/en/vm/sounds.xml b/conf/lang/en/vm/sounds.xml
index 3a058c513e..58d8711e85 100644
--- a/conf/lang/en/vm/sounds.xml
+++ b/conf/lang/en/vm/sounds.xml
@@ -201,7 +201,7 @@
   </macro>
 
   <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
+    <input pattern="^(\d+)$">
       <match>
 	<action function="play-file" data="voicemail/vm-greeting.wav"/>
 	<action function="say" data="$1" method="pronounced" type="items"/>
@@ -220,7 +220,7 @@
   </macro>
 
   <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
+    <input pattern="^(\d+)$">
       <match>
 	<action function="say" data="$1" method="pronounced" type="items"/>
       </match>
@@ -228,7 +228,7 @@
   </macro>
 
   <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
+    <input pattern="^([a-z]+):(\d+)$">
       <match>
 	<action function="play-file" data="voicemail/vm-$1.wav"/> 
 	<action function="play-file" data="voicemail/vm-message_number.wav"/>
diff --git a/src/switch_channel.c b/src/switch_channel.c
index 9b694df202..9cb028a472 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -610,7 +610,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(channel->session));
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Call-Direction", "%s", switch_channel_test_flag(channel, CF_OUTBOUND) ? "outbound" : "inbound");
 				if (switch_channel_test_flag(channel, CF_ANSWERED)) {
-					switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "confirmed");
+					switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "answered");
 				} else if (switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
 					switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "early");
 				} else {