diff --git a/Makefile.rules b/Makefile.rules
index 9a97373a55..89c5fc1137 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -37,9 +37,6 @@ endif
 
 OPTIMIZE?=-O6
 ifneq ($(findstring darwin,$(OSARCH)),)
-  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.4)
-    OPTIMIZE+=-fno-inline
-  endif
   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
     # Snow Leopard has an issue with this optimization flag on large files (like chan_sip)
     OPTIMIZE+=-fno-inline-functions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 35d38d9e41..71115ebf54 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -7457,6 +7457,7 @@ static int vm_intro(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm
 
 	/* Play voicemail intro - syntax is different for different languages */
 	if (0) {
+		return 0;
 	} else if (!strncasecmp(chan->language, "cs", 2)) {  /* CZECH syntax */
 		return vm_intro_cs(chan, vms);
 	} else if (!strncasecmp(chan->language, "cz", 2)) {  /* deprecated CZECH syntax */