diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 609b8877c6..6a37c31ade 100644
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -413,7 +413,7 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, con
   \brief Unsets private from a given channel
   \param channel channel to unsets data from
   \param key your private data's unique keyname 
-  \return void pointer to channel's private data
+  \return SWITCH_STATUS_SUCCESS if data was unset
 */
 SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);
 
diff --git a/src/mod/applications/mod_limit/mod_limit.c b/src/mod/applications/mod_limit/mod_limit.c
index dae22dcbf6..f7cb6f85d8 100644
--- a/src/mod/applications/mod_limit/mod_limit.c
+++ b/src/mod/applications/mod_limit/mod_limit.c
@@ -289,7 +289,7 @@ static switch_status_t do_config()
 
 	sql = switch_mprintf("delete from limit_data where hostname='%q';", globals.hostname);
 	limit_execute_sql(sql, globals.mutex);
-	switch_safe_free(sql);
+	switch_core_db_free(sql);
 
 	switch_xml_free(xml);
 
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 4bc856c367..cc9a00c8ae 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -3133,7 +3133,7 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL);
 		}
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 
 		test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname);
@@ -3143,7 +3143,7 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
 			switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL);
 		}
 
-		free(test_sql);
+		switch_core_db_free(test_sql);
 		test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
 
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
@@ -3158,21 +3158,21 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
 			switch_odbc_handle_exec(profile->master_odbc, pres_sql, NULL);
 		}
 
-		free(test_sql);
+		switch_core_db_free(test_sql);
 		test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname);
 
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL);
 		}
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname);
 		if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
 			switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL);
 			switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL);
 		}
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		for (x = 0; indexes[x]; x++) {
 			switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL);
@@ -3192,28 +3192,28 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
 								  mod_sofia_globals.hostname);
 		
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 		
 		test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_presence where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_presence", pres_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 
 		
 		test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname);
 		switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql);
-		free(test_sql);
+		switch_core_db_free(test_sql);
 		
 		switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", 
 							NULL, NULL, NULL);
diff --git a/src/switch_core.c b/src/switch_core.c
index 30b1353bc2..268190412c 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -758,7 +758,7 @@ static void load_mime_types(void)
 
  end:
 
-	switch_safe_free(mime_path);
+		switch_core_db_free(mime_path);
 
 }
 
@@ -1034,7 +1034,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
 
 	dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
 	switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
-	switch_safe_free(dir_path);
+	switch_core_db_free(dir_path);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
diff --git a/src/switch_core_db.c b/src/switch_core_db.c
index 94d4416b70..a1b54dc46b 100644
--- a/src/switch_core_db.c
+++ b/src/switch_core_db.c
@@ -85,7 +85,7 @@ SWITCH_DECLARE(int) switch_core_db_exec(switch_core_db_t *db, const char *sql, s
 		ret = sqlite3_exec(db, sql, callback, data, &err);
 		if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) {
 			if (sane > 1) {
-				switch_safe_free(err);
+				switch_core_db_free(err);
 				switch_cond_next();
 				continue;
 			}