diff --git a/tests/unit/switch_event.c b/tests/unit/switch_event.c
index c11dfc24d3..1f55b574b9 100644
--- a/tests/unit/switch_event.c
+++ b/tests/unit/switch_event.c
@@ -27,7 +27,7 @@ FST_TEST_BEGIN(benchmark)
   int rc = 0, loops = 10, x = 0;
   switch_status_t status = SWITCH_STATUS_SUCCESS;
   char **index = NULL;
-  unsigned long long micro_total = 0;
+  uint64_t micro_total = 0;
   double micro_per = 0;
   double rate_per_sec = 0;
 
@@ -63,7 +63,7 @@ FST_TEST_BEGIN(benchmark)
   micro_total = small_end_ts - small_start_ts;
   micro_per = micro_total / (double) loops;
   rate_per_sec = 1000000 / micro_per;
-  printf("switch_event add_header: Total %ldus / %ld loops, %.2f us per loop, %.0f loops per second\n", 
+  printf("switch_event add_header: Total %" SWITCH_UINT64_T_FMT "us / %d loops, %.2f us per loop, %.0f loops per second\n",
        micro_total, loops, micro_per, rate_per_sec);
 #endif
 
@@ -84,7 +84,7 @@ FST_TEST_BEGIN(benchmark)
   micro_total = small_end_ts - small_start_ts;
   micro_per = micro_total / (double) loops;
   rate_per_sec = 1000000 / micro_per;
-  printf("switch_event get_header: Total %ldus / %ld loops, %.2f us per loop, %.0f loops per second\n", 
+  printf("switch_event get_header: Total %" SWITCH_UINT64_T_FMT "us / %d loops, %.2f us per loop, %.0f loops per second\n", 
        micro_total, loops, micro_per, rate_per_sec);
 #endif
 
@@ -101,7 +101,7 @@ FST_TEST_BEGIN(benchmark)
   micro_total = end_ts - start_ts;
   micro_per = micro_total / (double) loops;
   rate_per_sec = 1000000 / micro_per;
-  printf("switch_event Total %ldus / %d loops, %.2f us per loop, %.0f loops per second\n", 
+  printf("switch_event Total %" SWITCH_UINT64_T_FMT "us / %d loops, %.2f us per loop, %.0f loops per second\n", 
        micro_total, loops, micro_per, rate_per_sec);
 
 }
diff --git a/tests/unit/switch_hash.c b/tests/unit/switch_hash.c
index a8d57c527c..43d3e18692 100644
--- a/tests/unit/switch_hash.c
+++ b/tests/unit/switch_hash.c
@@ -24,7 +24,7 @@ FST_TEST_BEGIN(benchmark)
   switch_bool_t verbose = SWITCH_TRUE;
   const char *err = NULL;
   switch_time_t start_ts, end_ts;
-  unsigned long long micro_total = 0;
+  uint64_t micro_total = 0;
   double micro_per = 0;
   double rate_per_sec = 0;
   int x = 0;
@@ -131,7 +131,7 @@ FST_TEST_BEGIN(benchmark)
   micro_total = end_ts - start_ts;
   micro_per = micro_total / (double) loops;
   rate_per_sec = 1000000 / micro_per;
-  printf("switch_hash Total %ldus / %d loops, %.2f us per loop, %.0f loops per second\n", 
+  printf("switch_hash Total %" SWITCH_UINT64_T_FMT "us / %d loops, %.2f us per loop, %.0f loops per second\n", 
        micro_total, loops, micro_per, rate_per_sec);
 }
 FST_TEST_END()
diff --git a/tests/unit/switch_ivr_originate.c b/tests/unit/switch_ivr_originate.c
index 3b2cb4154b..1b7ff19a4a 100644
--- a/tests/unit/switch_ivr_originate.c
+++ b/tests/unit/switch_ivr_originate.c
@@ -42,6 +42,8 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
 	switch_assert(session);
 	reporting++;
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "session reporting %d\n", reporting);
+
+	return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t my_on_destroy(switch_core_session_t *session)
@@ -49,6 +51,8 @@ static switch_status_t my_on_destroy(switch_core_session_t *session)
 	switch_assert(session);
 	destroy++;
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "session destroy %d\n", destroy);
+
+	return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_state_handler_table_t state_handlers = {