diff --git a/main/manager.c b/main/manager.c
index 35ba5d46cb..f5d00d1d35 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -6317,7 +6317,7 @@ int ast_manager_register2(const char *action, int auth, int (*func)(struct manse
 {
 	struct manager_action *cur;
 
-	cur = ao2_alloc(sizeof(*cur), action_destroy);
+	cur = ao2_t_alloc(sizeof(*cur), action_destroy, action);
 	if (!cur) {
 		return -1;
 	}
diff --git a/res/res_fax.c b/res/res_fax.c
index d59ab09e6e..68d2972cbd 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -4553,6 +4553,10 @@ static int unload_module(void)
 		ast_log(LOG_WARNING, "failed to unregister '%s'\n", app_receivefax);
 	}
 
+	ast_manager_unregister("FAXSessions");
+	ast_manager_unregister("FAXSession");
+	ast_manager_unregister("FAXStats");
+
 	if (fax_logger_level != -1) {
 		ast_logger_unregister_level("FAX");
 	}