diff --git a/Makefile b/Makefile
index fb9a3534bad25de6b5e9b4ef16f4f91febc1b420..4e704039364cf0a16f16981dc0f5790226cd6a56 100644
--- a/Makefile
+++ b/Makefile
@@ -528,7 +528,7 @@ include/asterisk/version.h:
 	rm -f $@.tmp
 
 stdtime/libtime.a:
-	CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
+	CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a
 
 asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
 	build_tools/make_build_h > include/asterisk/build.h.tmp
@@ -543,9 +543,9 @@ muted: muted.o
 	$(CC) $(AUDIO_LIBS) -o muted muted.o
 
 subdirs: 
-	@for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
-	@CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils
-	@CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi
+	@for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C $$x || exit 1 ; done
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C utils
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C agi
 
 clean-depend:
 	@for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
diff --git a/indications.c b/indications.c
index 9b632de98acb4698054e20cd7e35f40760c81f2c..996e43e86707ba30af88f99db77a293b1979ddb3 100644
--- a/indications.c
+++ b/indications.c
@@ -412,12 +412,13 @@ struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, co
 	struct tone_zone_sound *ts;
 
 	/* we need some tonezone, pick the first */
-	if (zone == NULL && current_tonezone)
-		zone = current_tonezone;	/* default country? */
-	if (zone == NULL && tone_zones)
-		zone = tone_zones;		/* any country? */
-	if (zone == NULL)
-		return 0;	/* not a single country insight */
+	if (!zone) {
+		if (current_tonezone)
+			return current_tonezone; /* default country? */
+		if (tone_zones)
+			return tone_zones; /* any country? */
+		return 0; /* not a single country insight */
+	}
 
 	if (ast_mutex_lock(&tzlock)) {
 		ast_log(LOG_WARNING, "Unable to lock tone_zones list\n");